Skip to content

Actix Webを4系にバージョンアップ #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glassonion1 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Actix Webを4系にバージョンアップ #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ab1a04
Actix Webを4系にバージョンアップ
Jul 12, 2021
e3eb8de
Exampleのkey vaultを修正
Jul 13, 2021
6fa19ef
exampleのerc20を修正
Jul 13, 2021
ebfe097
integrationテスト修正
Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
667 changes: 332 additions & 335 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions example/erc20/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ edition = "2018"
state-runtime-node-server = { path = "../../../nodes/state-runtime/server", default-features = false }
anonify-eth-driver = { path = "../../../modules/anonify-eth-driver", default-features = false }
frame-host = { path = "../../../frame/host" }
actix-web = "3"
actix-web = "4.0.0-beta.1"
failure = "0.1"
tracing-subscriber = "0.2"
actix-web-opentelemetry = "0.9"
opentelemetry-jaeger = { version = "0.10", features = ["tokio"] }
tracing-opentelemetry = "0.10"
actix-web-opentelemetry = "0.11.0-beta.4"
opentelemetry-jaeger = { version = "0.11", features = ["tokio"] }
tracing-opentelemetry = "0.11"

[features]
default = ["backup-enable"]
Expand Down
2 changes: 1 addition & 1 deletion example/erc20/server/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ async fn main() -> io::Result<()> {
HttpServer::new(move || {
App::new()
.wrap(RequestTracing::new())
.data(server.clone())
.app_data(server.clone())
.route("/api/v1/health", web::get().to(handle_health_check))
.route("/api/v1/state", web::post().to(handle_send_command))
.route("/api/v1/state", web::get().to(handle_get_state))
Expand Down
2 changes: 1 addition & 1 deletion example/key-vault/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
key-vault-node-server = { path = "../../../nodes/key-vault", default-features = false }
anonify-eth-driver = { path = "../../../modules/anonify-eth-driver", default-features = false }
frame-host = { path = "../../../frame/host" }
actix-web = "3"
actix-web = "4.0.0-beta.1"
failure = "0.1"
tracing-subscriber = "0.2"

Expand Down
2 changes: 1 addition & 1 deletion example/key-vault/server/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ async fn main() -> io::Result<()> {

HttpServer::new(move || {
App::new()
.data(server.clone())
.app_data(server.clone())
.route("/api/v1/health", web::get().to(handle_health_check))
})
.bind(my_node_url)?
Expand Down
2 changes: 1 addition & 1 deletion frame/retrier/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
tracing = { version = "0.1", default-features = false }
actix-rt = { version = "1.1", optional = true }
actix-rt = { version = "2.2", optional = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion frame/retrier/src/retry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ where
curr_tries + 1,
res
);
actix_rt::time::delay_for(delay).await;
actix_rt::time::sleep(delay).await;
} else {
// if it overs the number of retries
return res;
Expand Down
6 changes: 3 additions & 3 deletions nodes/key-vault/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["LayerX Labs <div-labs@layerx.co.jp>"]
edition = "2018"

[dependencies]
actix-web = "3"
actix-web = "4.0.0-beta.1"
anyhow = "1.0"
sgx_types = "1.1.1"
tracing = "0.1"
Expand All @@ -21,11 +21,11 @@ anonify-eth-driver = { path = "../../modules/anonify-eth-driver" }
state-runtime-node-server = { path = "../../nodes/state-runtime/server" }
state-runtime-node-api = { path = "../../nodes/state-runtime/api" }
test-utils = { path = "../../tests/utils" }
actix-rt = "1.1"
actix-rt = "2.2"
serde_json = "1.0"
once_cell = "1.5.2"
web3 = "0.14"
sgx_urts = "1.1.1"
rand_core = "0.5"
rand = "0.7"
tracing-core = "0.1"
tracing-core = "0.1"
4 changes: 2 additions & 2 deletions nodes/state-runtime/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ frame-host = { path = "../../../frame/host" }
frame-common = { path = "../../../frame/common" }
frame-config = { path = "../../../frame/config" }
sgx_types = "1.1.1"
actix-web = "3"
actix-rt = "1.1"
actix-web = "4.0.0-beta.1"
actix-rt = "2.2"
failure = "0.1"
tracing = "0.1"
tracing-subscriber = "0.2"
Expand Down
4 changes: 2 additions & 2 deletions scripts/pre-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ cargo build

echo 'build Anonify_common_t.o'
cd ${ANONIFY_ROOT}/scripts
make DEBUG=1 ENCLAVE_DIR=example/erc20/enclave/erc20 ENCLAVE_PKG_NAME=erc20 ../build/Anonify_common_t.o
make DEBUG=1 TEST=1 ENCLAVE_DIR=example/erc20/enclave/erc20 ENCLAVE_PKG_NAME=erc20 ../build/Anonify_test_t.o
make DEBUG=1 ENCLAVE_DIR=example/erc20/enclave ENCLAVE_PKG_NAME=erc20 ../build/Anonify_common_t.o
make DEBUG=1 TEST=1 ENCLAVE_DIR=example/erc20/enclave ENCLAVE_PKG_NAME=erc20 ../build/Anonify_test_t.o
2 changes: 1 addition & 1 deletion tests/integration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ frame-host = { path = "../../frame/host" }
anonify-eth-driver = { path = "../../modules/anonify-eth-driver" }
anonify-ecall-types = { path = "../../modules/anonify-ecall-types" }
test-utils = { path = "../utils" }
actix-rt = "1.1"
actix-rt = "2.2"
tracing = "0.1"
tracing-subscriber = "0.2"
tracing-core = "0.1"
Expand Down