Skip to content

Pull from paritytech/substrate#7590 #7

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

Merged
clearloop merged 27 commits into from
Nov 25, 2020
Merged

Pull from paritytech/substrate#7590 #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
11ace4e
make ClientConfig public (#7544)
insipx Nov 16, 2020
407cd3a
sc-basic-authorship: remove useless dependencies (#7550)
koushiro Nov 18, 2020
2d97a12
Add slashing events to elections-phragmen. (#7543)
kianenigma Nov 18, 2020
c180950
Remove necessity to pass ConsensusEngineId when registering notificat…
tomaka Nov 18, 2020
9d65d98
sc-cli: replace bip39 with tiny-bip39 (#7551)
koushiro Nov 18, 2020
69198d1
Add extra docs to on_initialize (#7552)
tomusdrw Nov 18, 2020
f74de63
More Extensible Multiaddress Format (#7380)
shawntabrizi Nov 19, 2020
1c122c6
Fix weight template to remove ugliness in rust doc (#7565)
athei Nov 20, 2020
a0e8b7e
Cargo.lock: Run cargo update (#7553)
mxinden Nov 20, 2020
5f17393
.github: Add dependabot config and thus enable dependabot (#7509)
mxinden Nov 20, 2020
faad534
Thread-local parameter_types for testing. (#7542)
kianenigma Nov 20, 2020
a208da1
Bump wasm-bindgen-test from 0.3.12 to 0.3.17 (#7567)
dependabot[bot] Nov 20, 2020
23473ca
pallet-evm: move to Frontier (Part IV) (#7573)
sorpaas Nov 22, 2020
24eec92
Bump secrecy from 0.6.0 to 0.7.0 (#7568)
dependabot[bot] Nov 22, 2020
756212f
Bump wasm-bindgen-futures from 0.4.17 to 0.4.18 (#7572)
dependabot[bot] Nov 22, 2020
6c83f39
Bump lru from 0.4.3 to 0.6.1 (#7577)
dependabot[bot] Nov 23, 2020
40e08ee
Bump wasm-bindgen-test from 0.3.17 to 0.3.18 (#7579)
dependabot[bot] Nov 23, 2020
0fcbef2
Bump wasm-timer from 0.2.4 to 0.2.5 (#7578)
dependabot[bot] Nov 23, 2020
f16acff
grandpa: remove light-client specific block import pipeline (#7546)
andresilva Nov 23, 2020
0840c58
client/authority-discovery: Publish and query on exponential interval…
mxinden Nov 23, 2020
d021078
sc-network: update some dependencies (#7582)
koushiro Nov 23, 2020
3558103
Bump linregress and do some other cleanups (#7580)
bkchr Nov 23, 2020
7e94f01
Wasm-builder 3.0 (#7532)
bkchr Nov 24, 2020
31733d5
Bump tracing from 0.1.21 to 0.1.22 (#7589)
dependabot[bot] Nov 24, 2020
9a29852
contracts: Add `salt` argument to contract instantiation (#7482)
athei Nov 24, 2020
24809aa
*/Cargo.toml: Remove unused dependencies (#7590)
mxinden Nov 24, 2020
0ea060a
Merge remote-tracking branch 'parity/master' into bump/contracts
clearloop Nov 25, 2020
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
Prev Previous commit
Next Next commit
sc-network: update some dependencies (paritytech#7582) 
Signed-off-by: koushiro <[email protected]>
  • Loading branch information
@koushiro
koushiro authored Nov 23, 2020
commit d021078200021b1fcae1aa8434282edd9e6a8f4b
48 changes: 15 additions & 33 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions client/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ prost-build = "0.6.1"
async-trait = "0.1"
async-std = "1.6.5"
bitflags = "1.2.0"
bs58 = "0.3.1"
bs58 = "0.4.0"
bytes = "0.5.0"
codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
derive_more = "0.99.2"
Expand All @@ -38,7 +38,7 @@ linked_hash_set = "0.1.3"
log = "0.4.8"
lru = "0.6.1"
nohash-hasher = "0.2.0"
parking_lot = "0.10.0"
parking_lot = "0.11.1"
pin-project = "0.4.6"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
prost = "0.6.1"
Expand All @@ -50,15 +50,15 @@ serde = { version = "1.0.101", features = ["derive"] }
serde_json = "1.0.41"
slog = { version = "2.5.2", features = ["nested-values"] }
slog_derive = "0.2.0"
smallvec = "0.6.10"
smallvec = "1.5.0"
sp-arithmetic = { version = "2.0.0", path = "../../primitives/arithmetic" }
sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
sp-consensus = { version = "0.8.0", path = "../../primitives/consensus/common" }
sp-core = { version = "2.0.0", path = "../../primitives/core" }
sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
thiserror = "1"
unsigned-varint = { version = "0.4.0", features = ["futures", "futures-codec"] }
unsigned-varint = { version = "0.5.0", features = ["futures", "futures-codec"] }
void = "1.0.2"
wasm-timer = "0.2"
zeroize = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion client/network/src/protocol/generic_proto/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ impl ProtocolsHandler for NotifsHandler {
},

NotifsHandlerIn::Close => {
for mut substream in self.legacy_substreams.drain() {
for mut substream in self.legacy_substreams.drain(..) {
substream.shutdown();
self.legacy_shutdown.push(substream);
}
Expand Down