Skip to content
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

refactor: Upgraded all the dependencies #3869

Merged
merged 10 commits into from
Feb 3, 2021
Merged

refactor: Upgraded all the dependencies #3869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
baa656b
refactor: Upgraded all the dependencies
frol Jan 29, 2021
e889e67
fixed compilation errors
frol Feb 1, 2021
daadda5
fix node crash
bowenwang1996 Feb 1, 2021
d6058d0
fixed the failing tests/test_errors.rs
frol Feb 2, 2021
18f25d8
ignore test
bowenwang1996 Feb 3, 2021
11d8e0a
fix tests
bowenwang1996 Feb 3, 2021
aa790c7
fixed tests around the actix::System usage (needs further refactoring…
frol Feb 3, 2021
546dbd9
fixed sanity tests (removed unused variables)
frol Feb 3, 2021
baa6551
Merge remote-tracking branch 'origin/master' into refactor/upgrade-de…
frol Feb 3, 2021
c9c66e7
Merge remote-tracking branch 'origin/master' into refactor/upgrade-de…
frol Feb 3, 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
2,441 changes: 1,189 additions & 1,252 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 6 additions & 14 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ members = [
"core/runtime-configs",
"core/store",
"core/metrics",
"utils/actix",
"runtime/near-evm-runner",
"runtime/near-runtime-fees",
"runtime/near-vm-logic",
Expand Down Expand Up @@ -48,23 +47,13 @@ members = [
"tools/delay_detector"
]

[dependencies]
# pins this version to fix https://github.com/actix/actix-net/issues/129
actix-rt = "=1.1.1"
openssl-probe = { version = "0.1.2" }
# pin syn to fix https://github.com/nushell/nushell/pull/2868
syn = "=1.0.57"

[dev-dependencies]
actix = "0.9"
lazy_static = "1.4"
log = "^0.4.6"
# Pin dependency to avoid compilation errors
actix-rt = "=2.0.0-beta.2"

rand = "0.7"
serde_json = "1"
futures = "0.3"

near-logger-utils = { path = "./test-utils/logger" }
near-actix-utils = { path = "./utils/actix" }
near-chain-configs = { path = "./core/chain-configs" }
near-crypto = { path = "./core/crypto" }
near-primitives = { path = "./core/primitives" }
Expand All @@ -81,6 +70,9 @@ 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" }

[profile.release]
lto = true # Enable full link-time optimization.
codegen-units = 1 # Use only 1 codegen-unit to enable full optimizations.
Expand Down
9 changes: 4 additions & 5 deletions chain/chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ lazy_static = "1.4"
rocksdb = { git = "https://github.com/nearprotocol/rust-rocksdb", branch="disable-thread" }
rand = "0.7"
serde = { version = "1", features = [ "derive" ] }
cached = "0.12"
num-rational = "0.2.4"
cached = "0.23"
num-rational = "0.3"
tracing = "0.1.13"
thiserror = "1.0"
strum = "0.18"
strum_macros = "0.18"
strum = "0.20"

borsh = "0.7.1"
borsh = "0.8.1"

near-chain-configs = { path = "../../core/chain-configs" }
near-chain-primitives = { path = "../chain-primitives" }
Expand Down
6 changes: 3 additions & 3 deletions chain/chunks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ authors = ["Near Inc <hello@nearprotocol.com>"]
edition = "2018"

[dependencies]
actix = "0.9"
actix = "0.11.0-beta.1"
futures = "0.3"
rand = "0.7"
chrono = "0.4.6"
log = "0.4"
borsh = "0.7.1"
borsh = "0.8.1"
serde = { version = "1", features = [ "derive" ] }
cached = "0.12"
cached = "0.23"
reed-solomon-erasure = "4"

near-crypto = { path = "../../core/crypto" }
Expand Down
4 changes: 2 additions & 2 deletions chain/client-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
actix = "0.9"
actix = "0.11.0-beta.1"
chrono = { version = "0.4.4", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
strum = { version = "0.18", features = ["derive"] }
strum = { version = "0.20", features = ["derive"] }
thiserror = "1.0"

near-chain-primitives = { path = "../chain-primitives" }
Expand Down
14 changes: 7 additions & 7 deletions chain/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ authors = ["Near Inc <hello@nearprotocol.com>"]
edition = "2018"

[dependencies]
ansi_term = "0.11"
actix = "0.9"
ansi_term = "0.12"
actix = "0.11.0-beta.1"
futures = "0.3"
chrono = { version = "0.4.4", features = ["serde"] }
rocksdb = { git = "https://github.com/nearprotocol/rust-rocksdb", branch="disable-thread" }
Expand All @@ -16,12 +16,12 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
# Temporary workaround, fix with rust toolchain update.
sysinfo = { git = "https://github.com/near/sysinfo", rev = "3cb97ee79a02754407d2f0f63628f247d7c65e7b" }
strum = { version = "0.18", features = ["derive"] }
cached = "0.12"
strum = { version = "0.20", features = ["derive"] }
cached = "0.23"
lazy_static = "1.4"
borsh = "0.7.1"
borsh = "0.8.1"
reed-solomon-erasure = "4"
num-rational = "0.2.4"
num-rational = "0.3"
linked-hash-map = "0.5.3"

near-crypto = { path = "../../core/crypto" }
Expand All @@ -38,7 +38,7 @@ near-telemetry = { path = "../telemetry" }
near-performance-metrics = { path = "../../utils/near-performance-metrics" }
near-performance-metrics-macros = { path = "../../utils/near-performance-metrics-macros" }

delay-detector = { path = "../../tools/delay_detector", optional = true}
delay-detector = { path = "../../tools/delay_detector", optional = true }

[dev-dependencies]
near-logger-utils = { path = "../../test-utils/logger" }
Expand Down
Loading