diff --git a/Cargo.lock b/Cargo.lock index 17dbaddaf45..ec4592d348d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,9 +41,10 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.5.4" -source = "git+https://github.com/near/actix-extras.git?branch=actix-web-4-beta.3#dad9f161a4b036f3f1f344f0cad0ff009e8c7941" +version = "0.6.0-beta.2" +source = "git+https://github.com/near/actix-extras.git?branch=actix-web-4-beta.6#eb38fbccd2df7846f83f2d9ace3b4c2a593614f0" dependencies = [ + "actix-service", "actix-web", "derive_more", "futures-util", @@ -54,9 +55,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.3" +version = "3.0.0-beta.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a12706e793a92377f85cec219514b72625b3b89f9b4912d8bfb53ab6a615bf0" +checksum = "59d51c2ba06062e698a5d212d860e9fb2afc931c285ede687aaae896c8150347" dependencies = [ "actix-codec", "actix-rt", @@ -69,33 +70,31 @@ dependencies = [ "brotli2", "bytes", "bytestring", - "cookie", "derive_more", "encoding_rs", "flate2", - "futures-channel", "futures-core", "futures-util", "h2", "http", "httparse", - "indexmap", "itoa", "language-tags", - "lazy_static", + "local-channel", "log", "mime", + "once_cell", + "paste", "percent-encoding", "pin-project", + "pin-project-lite", "rand 0.8.3", "regex", "serde", - "serde_json", - "serde_urlencoded", "sha-1", - "slab", "smallvec", "time 0.2.25", + "tokio", ] [[package]] @@ -123,9 +122,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b4e57bc1a3915e71526d128baf4323700bd1580bc676239e2298a4c5b001f18" +checksum = "bc7d7cd957c9ed92288a7c3c96af81fa5291f65247a76a34dac7b6af74e52ba0" dependencies = [ "actix-macros", "futures-core", @@ -152,19 +151,20 @@ dependencies = [ [[package]] name = "actix-service" -version = "2.0.0-beta.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca9756f4d32984ac454ae3155a276f6be69b424197bd3f0ca3c87cde72f41d63" +checksum = "77f5f9d66a8730d0fae62c26f3424f5751e5518086628a40b7ab6fca4a705034" dependencies = [ "futures-core", + "paste", "pin-project-lite", ] [[package]] name = "actix-tls" -version = "3.0.0-beta.3" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322b22e9238d065f331af0585089de8c36978fcc56f888054add4e4365b9916b" +checksum = "65b7bb60840962ef0332f7ea01a57d73a24d2cb663708511ff800250bbfef569" dependencies = [ "actix-codec", "actix-rt", @@ -181,24 +181,19 @@ dependencies = [ [[package]] name = "actix-utils" -version = "3.0.0-beta.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458795e09a29bc5557604f9ff6f32236fd0ee457d631672e4ec8f6a0103bb292" +checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94" dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "futures-core", - "futures-sink", - "log", + "local-waker", "pin-project-lite", ] [[package]] name = "actix-web" -version = "4.0.0-beta.3" +version = "4.0.0-beta.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9683dc8c3037ea524e0fec6032d34e1cb1ee72c4eb8689f428a60c2a544ea3" +checksum = "ff12e933051557d700b0fcad20fe25b9ca38395cc87bbc5aeaddaef17b937a2f" dependencies = [ "actix-codec", "actix-http", @@ -211,32 +206,34 @@ dependencies = [ "actix-utils", "actix-web-codegen", "ahash 0.7.0", - "awc", "bytes", + "cookie", "derive_more", "either", "encoding_rs", "futures-core", "futures-util", + "itoa", + "language-tags", "log", "mime", - "openssl", + "once_cell", "pin-project", "regex", "serde", "serde_json", "serde_urlencoded", "smallvec", - "socket2", + "socket2 0.4.0", "time 0.2.25", "url", ] [[package]] name = "actix-web-codegen" -version = "0.5.0-beta.1" +version = "0.5.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8313dc4cbcae1785a7f14c3dfb7dfeb25fe96a03b20e5c38fe026786def5aa70" +checksum = "7f138ac357a674c3b480ddb7bbd894b13c1b6e8927d728bc9ea5e17eee2f8fc9" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -403,9 +400,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "3.0.0-beta.2" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da7225ad81fbad09ef56ccc61e0688abe8494a68722c5d0df5e2fc8b724a200b" +checksum = "d8bea03ceedb5bc5d1696f0d800dfcb81cf3d1991eed1c84ae00306eb74b2d70" dependencies = [ "actix-codec", "actix-http", @@ -413,13 +410,14 @@ dependencies = [ "actix-service", "base64 0.13.0", "bytes", - "cfg-if 1.0.0", + "cookie", "derive_more", "futures-core", + "itoa", "log", "mime", - "openssl", "percent-encoding", + "pin-project-lite", "rand 0.8.3", "serde", "serde_json", @@ -989,9 +987,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "cookie" -version = "0.14.3" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f" +checksum = "ffdf8865bac3d9a3bde5bde9088ca431b11f5d37c7a578b8086af77248b76627" dependencies = [ "percent-encoding", "time 0.2.25", @@ -1694,7 +1692,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d4e679d6864bc26210feb5cf044e245741cd9d7701b35c00440a6e84d61399" dependencies = [ "anyhow", - "ethereum-types 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ethereum-types 0.10.0", "hex", "serde", "serde_json", @@ -1743,13 +1741,6 @@ dependencies = [ "ethereum-types 0.11.0", ] -[[package]] -name = "ethereum-types" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" -replace = "ethereum-types 0.10.0" - [[package]] name = "ethereum-types" version = "0.11.0" @@ -2168,9 +2159,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5" +checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00" dependencies = [ "bytes", "fnv", @@ -2183,7 +2174,6 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "tracing-futures", ] [[package]] @@ -2345,7 +2335,7 @@ dependencies = [ "httpdate", "itoa", "pin-project", - "socket2", + "socket2 0.3.19", "tokio", "tower-service", "tracing", @@ -2778,6 +2768,24 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "local-channel" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6246c68cf195087205a0512559c97e15eaf95198bf0e206d662092cdcb03fe9f" +dependencies = [ + "futures-core", + "futures-sink", + "futures-util", + "local-waker", +] + +[[package]] +name = "local-waker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f9a2d3e27ce99ce2c3aad0b09b1a7b916293ea9b2bf624c13fe646fadd8da4" + [[package]] name = "lock_api" version = "0.3.4" @@ -2785,6 +2793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" dependencies = [ "scopeguard", + "serde", ] [[package]] @@ -2794,7 +2803,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" dependencies = [ "scopeguard", - "serde", ] [[package]] @@ -2954,11 +2962,10 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2", "winapi", ] @@ -3244,6 +3251,7 @@ dependencies = [ "actix", "actix-cors", "actix-web", + "awc", "borsh", "easy-ext", "futures", @@ -3273,6 +3281,7 @@ name = "near-jsonrpc-client" version = "0.1.0" dependencies = [ "actix-web", + "awc", "futures", "near-jsonrpc-primitives", "near-primitives", @@ -3462,6 +3471,7 @@ dependencies = [ "actix", "actix-cors", "actix-web", + "awc", "derive_more", "futures", "hex", @@ -3560,6 +3570,7 @@ version = "0.1.0" dependencies = [ "actix", "actix-web", + "awc", "futures", "near-performance-metrics", "near-performance-metrics-macros", @@ -3683,7 +3694,7 @@ version = "1.2.0" dependencies = [ "actix", "actix-rt", - "actix-web", + "awc", "borsh", "byteorder", "chrono", @@ -3960,7 +3971,7 @@ dependencies = [ [[package]] name = "paperclip" version = "0.5.0" -source = "git+https://github.com/frol/paperclip?branch=actix-web-4-beta.3#1c0af65768ab94c1dc95ee212ac790417f695e91" +source = "git+https://github.com/near/paperclip?branch=actix-web-4-beta.6#b9589c6e520eeee4a07ed94f7e32c476990d6536" dependencies = [ "anyhow", "itertools 0.10.0", @@ -3968,8 +3979,8 @@ dependencies = [ "paperclip-actix", "paperclip-core", "paperclip-macros", - "parking_lot 0.11.1", - "semver 0.11.0", + "parking_lot 0.10.2", + "semver", "serde", "serde_derive", "serde_json", @@ -3981,7 +3992,7 @@ dependencies = [ [[package]] name = "paperclip-actix" version = "0.3.0" -source = "git+https://github.com/frol/paperclip?branch=actix-web-4-beta.3#1c0af65768ab94c1dc95ee212ac790417f695e91" +source = "git+https://github.com/near/paperclip?branch=actix-web-4-beta.6#b9589c6e520eeee4a07ed94f7e32c476990d6536" dependencies = [ "actix-service", "actix-web", @@ -3989,20 +4000,20 @@ dependencies = [ "once_cell", "paperclip-core", "paperclip-macros", - "parking_lot 0.11.1", + "parking_lot 0.10.2", "serde_json", ] [[package]] name = "paperclip-core" version = "0.3.0" -source = "git+https://github.com/frol/paperclip?branch=actix-web-4-beta.3#1c0af65768ab94c1dc95ee212ac790417f695e91" +source = "git+https://github.com/near/paperclip?branch=actix-web-4-beta.6#b9589c6e520eeee4a07ed94f7e32c476990d6536" dependencies = [ "actix-web", "mime", "once_cell", "paperclip-macros", - "parking_lot 0.11.1", + "parking_lot 0.10.2", "pin-project", "regex", "serde", @@ -4014,7 +4025,7 @@ dependencies = [ [[package]] name = "paperclip-macros" version = "0.4.0" -source = "git+https://github.com/frol/paperclip?branch=actix-web-4-beta.3#1c0af65768ab94c1dc95ee212ac790417f695e91" +source = "git+https://github.com/near/paperclip?branch=actix-web-4-beta.6#b9589c6e520eeee4a07ed94f7e32c476990d6536" dependencies = [ "heck", "http", @@ -4174,15 +4185,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - [[package]] name = "pin-project" version = "1.0.5" @@ -4899,7 +4901,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver 0.9.0", + "semver", ] [[package]] @@ -4985,16 +4987,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -5003,15 +4996,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" version = "1.0.123" @@ -5232,6 +5216,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "spin" version = "0.5.2" @@ -5677,9 +5671,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a" +checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5" dependencies = [ "autocfg 1.0.1", "bytes", @@ -5820,16 +5814,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.2" @@ -5913,12 +5897,6 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - [[package]] name = "uint" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index 8fd5c4e1225..d6bbb5323d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,8 +70,8 @@ neard = { path = "./neard"} testlib = { path = "./test-utils/testlib" } -[replace] -"ethereum-types:0.10.0" = { path = "./patches/ethereum-types-0.10.0-to-0.11.0" } +[patch.crates-io] +ethereum-types = { path = "./patches/ethereum-types-0.10.0-to-0.11.0" } [profile.release] lto = true # Enable full link-time optimization. diff --git a/chain/jsonrpc/Cargo.toml b/chain/jsonrpc/Cargo.toml index f02f3899a15..be5806b2c2e 100644 --- a/chain/jsonrpc/Cargo.toml +++ b/chain/jsonrpc/Cargo.toml @@ -6,8 +6,9 @@ edition = "2018" [dependencies] actix = "0.11.0-beta.2" -actix-web = "4.0.0-beta.3" -actix-cors = { git = "https://github.com/near/actix-extras.git", branch="actix-web-4-beta.3" } +awc = "3.0.0-beta.5" +actix-web = "4.0.0-beta.6" +actix-cors = { git = "https://github.com/near/actix-extras.git", branch="actix-web-4-beta.6" } easy-ext = "0.2" tokio = { version = "1.1", features = ["full"] } futures = "0.3" diff --git a/chain/jsonrpc/client/Cargo.toml b/chain/jsonrpc/client/Cargo.toml index 0631048642c..a7b54eb587c 100644 --- a/chain/jsonrpc/client/Cargo.toml +++ b/chain/jsonrpc/client/Cargo.toml @@ -5,7 +5,8 @@ authors = ["Near Inc "] edition = "2018" [dependencies] -actix-web = "4.0.0-beta.1" +awc = "3.0.0-beta.5" +actix-web = "4.0.0-beta.6" futures = "0.3" serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/chain/jsonrpc/client/src/lib.rs b/chain/jsonrpc/client/src/lib.rs index 823d929e166..1b1696d0f3e 100644 --- a/chain/jsonrpc/client/src/lib.rs +++ b/chain/jsonrpc/client/src/lib.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use actix_web::client::{Client, Connector}; +use awc::{Client, Connector}; use futures::{future, future::LocalBoxFuture, FutureExt, TryFutureExt}; use serde::Deserialize; use serde::Serialize; @@ -260,8 +260,7 @@ fn create_client() -> Client { .connector( Connector::new() .conn_lifetime(Duration::from_secs(u64::max_value())) - .conn_keep_alive(Duration::from_secs(30)) - .finish(), + .conn_keep_alive(Duration::from_secs(30)), ) .finish() } diff --git a/chain/jsonrpc/tests/test_utils/mod.rs b/chain/jsonrpc/tests/test_utils/mod.rs index 13fa15b0022..0f39eb79659 100644 --- a/chain/jsonrpc/tests/test_utils/mod.rs +++ b/chain/jsonrpc/tests/test_utils/mod.rs @@ -71,7 +71,7 @@ type RpcRequest = LocalBoxFuture<'static, Result( - client: &actix_web::client::Client, + client: &awc::Client, server_addr: &str, method: &str, params: serde_json::Value, diff --git a/chain/rosetta-rpc/Cargo.toml b/chain/rosetta-rpc/Cargo.toml index 9cdc35694f1..2cedffbebb3 100644 --- a/chain/rosetta-rpc/Cargo.toml +++ b/chain/rosetta-rpc/Cargo.toml @@ -12,9 +12,10 @@ hex = "0.4" lazy_static = "1.4" strum = { version = "0.20", features = ["derive"] } +awc = "3.0.0-beta.5" actix = "0.11.0-beta.2" -actix-web = "4.0.0-beta.3" -actix-cors = { git = "https://github.com/near/actix-extras.git", branch="actix-web-4-beta.3" } +actix-web = "4.0.0-beta.6" +actix-cors = { git = "https://github.com/near/actix-extras.git", branch="actix-web-4-beta.6" } futures = "0.3.5" tokio = { version = "1.1", features = ["full"] } @@ -22,7 +23,7 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" validator = "0.12" -paperclip = { git = "https://github.com/frol/paperclip", branch = "actix-web-4-beta.3", features = ["actix"] } +paperclip = { git = "https://github.com/near/paperclip", branch = "actix-web-4-beta.6", features = ["actix"] } near-primitives = { path = "../../core/primitives" } near-crypto = { path = "../../core/crypto" } diff --git a/chain/rosetta-rpc/src/models.rs b/chain/rosetta-rpc/src/models.rs index 7b13eac1319..7b3cf198d1c 100644 --- a/chain/rosetta-rpc/src/models.rs +++ b/chain/rosetta-rpc/src/models.rs @@ -543,10 +543,9 @@ where } impl actix_web::ResponseError for Error { - fn error_response(&self) -> actix_web::HttpResponse { + fn error_response(&self) -> actix_web::BaseHttpResponse { let data = paperclip::actix::web::Json(self); - actix_web::HttpResponse::build(actix_web::http::StatusCode::INTERNAL_SERVER_ERROR) - .json(data) + actix_web::HttpResponse::InternalServerError().json(data).into() } } diff --git a/chain/telemetry/Cargo.toml b/chain/telemetry/Cargo.toml index 6084b9df496..78494d8daec 100644 --- a/chain/telemetry/Cargo.toml +++ b/chain/telemetry/Cargo.toml @@ -6,7 +6,8 @@ edition = "2018" [dependencies] openssl = { version = "0.10", features = ["vendored"] } -actix-web = { version = "4.0.0-beta.1", features = [ "openssl" ] } +awc = "3.0.0-beta.5" +actix-web = { version = "4.0.0-beta.6", features = [ "openssl" ] } futures = "0.3" actix = "0.11.0-beta.2" serde = { version = "1", features = [ "derive" ] } diff --git a/chain/telemetry/src/lib.rs b/chain/telemetry/src/lib.rs index fd35f67f635..8d4164f31a5 100644 --- a/chain/telemetry/src/lib.rs +++ b/chain/telemetry/src/lib.rs @@ -1,7 +1,7 @@ use std::time::Duration; use actix::{Actor, Addr, Context, Handler, Message}; -use actix_web::client::{Client, Connector}; +use awc::{Client, Connector}; use futures::FutureExt; use near_performance_metrics_macros::perf; use serde::{Deserialize, Serialize}; @@ -49,8 +49,7 @@ impl TelemetryActor { .connector( Connector::new() .conn_lifetime(Duration::from_secs(u64::max_value())) - .conn_keep_alive(Duration::from_secs(30)) - .finish(), + .conn_keep_alive(Duration::from_secs(30)), ) .finish(); Self { config, client } diff --git a/neard/Cargo.toml b/neard/Cargo.toml index 00f023f73fe..835a7495225 100644 --- a/neard/Cargo.toml +++ b/neard/Cargo.toml @@ -7,9 +7,9 @@ default-run = "neard" [dependencies] jemallocator = { version = "0.3" } +awc = "3.0.0-beta.5" actix = "0.11.0-beta.2" actix-rt = "2" -actix-web = { version = "4.0.0-beta.1", features = [ "openssl" ] } byteorder = "1.2" easy-ext = "0.2" chrono = { version = "0.4.4", features = ["serde"] } diff --git a/neard/src/config.rs b/neard/src/config.rs index 8e0ea618170..cca1d5c90ba 100644 --- a/neard/src/config.rs +++ b/neard/src/config.rs @@ -7,7 +7,6 @@ use std::sync::Arc; use std::time::Duration; use actix; -use actix_web; use chrono::Utc; use num_rational::Rational; use serde::{Deserialize, Serialize}; @@ -1029,7 +1028,7 @@ pub fn download_genesis(url: &String, path: &PathBuf) { let path = path.clone(); actix::System::new().block_on(async move { - let client = actix_web::client::Client::new(); + let client = awc::Client::new(); let mut response = client.get(url).send().await.expect("Unable to download the genesis file");