pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 12:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

depend-o-pocalipse (#9450)

Browse Source 
Remove unneeded dependencies and dev-dependencies.
Made self_destruct test not dependent on wasm bin size.  
Updated code related to deprecated warning on tracing-subscriber `scope()` 
( See https://github.com/tokio-rs/tracing/issues/1429 )
This commit is contained in:
Squirrel
2021-08-13 15:18:37 +01:00
committed by GitHub
parent 76504e56d7
commit 7e9b8d278e
129 changed files with 487 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/finality-grandpa/Cargo.toml
+6 -8
View File
@@ -37,28 +37,26 @@ sc-telemetry = { version = "4.0.0-dev", path = "../telemetry" }
sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
serde_json = "1.0.41"
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sc-network = { version = "0.10.0-dev", path = "../network" }
sc-network-gossip = { version = "0.10.0-dev", path = "../network-gossip" }
sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"}
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0" }
sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
pin-project = "1.0.4"
linked-hash-map = "0.5.4"
async-trait = "0.1.50"
wasm-timer = "0.2"
[dev-dependencies]
assert_matches = "1.3.0"
finality-grandpa = { version = "0.14.1", features = ["derive-codec", "test-helpers"] }
finality-grandpa = { version = "0.14.1", features = [
"derive-codec",
"test-helpers",
] }
sc-network = { version = "0.10.0-dev", path = "../network" }
sc-network-test = { version = "0.8.0", path = "../network/test" }
sp-keyring = { version = "4.0.0-dev", path = "../../primitives/keyring" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
sp-consensus-babe = { version = "0.10.0-dev", path = "../../primitives/consensus/babe" }
sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }
sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
tokio = { version = "0.2", features = ["rt-core"] }
tempfile = "3.1.0"
substrate/client/finality-grandpa/rpc/Cargo.toml
+4 -5
View File
@@ -29,11 +29,10 @@ sc-client-api = { version = "4.0.0-dev", path = "../../api" }
[dev-dependencies]
sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
sc-network-test = { version = "0.8.0", path = "../../network/test" }
sc-rpc = { version = "4.0.0-dev", path = "../../rpc", features = ["test-helpers"] }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
sc-rpc = { version = "4.0.0-dev", path = "../../rpc", features = [
"test-helpers",
] }
sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
sp-finality-grandpa = { version = "4.0.0-dev", path = "../../../primitives/finality-grandpa" }
sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
lazy_static = "1.4"
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
substrate/client/finality-grandpa/src/communication/gossip.rs
+6 -4
View File
@@ -1194,19 +1194,21 @@ impl<Block: BlockT> Inner<Block> {
catch_up_request: &CatchUpRequestMessage,
) -> (bool, Option<Report>) {
let report = match &self.pending_catch_up {
PendingCatchUp::Requesting { who: peer, instant, .. } =>
PendingCatchUp::Requesting { who: peer, instant, .. } => {
if instant.elapsed() <= CATCH_UP_REQUEST_TIMEOUT {
return (false, None)
} else {
// report peer for timeout
Some((peer.clone(), cost::CATCH_UP_REQUEST_TIMEOUT))
},
PendingCatchUp::Processing { instant, .. } =>
}
},
PendingCatchUp::Processing { instant, .. } => {
if instant.elapsed() < CATCH_UP_PROCESS_TIMEOUT {
return (false, None)
} else {
None
},
}
},
_ => None,
};
substrate/client/finality-grandpa/src/communication/mod.rs
+9 -6
View File
@@ -684,18 +684,21 @@ impl<Block: BlockT> Sink<Message<Block>> for OutgoingMessages<Block> {
fn start_send(mut self: Pin<&mut Self>, mut msg: Message<Block>) -> Result<(), Self::Error> {
// if we've voted on this round previously under the same key, send that vote instead
match &mut msg {
finality_grandpa::Message::PrimaryPropose(ref mut vote) =>
finality_grandpa::Message::PrimaryPropose(ref mut vote) => {
if let Some(propose) = self.has_voted.propose() {
*vote = propose.clone();
},
finality_grandpa::Message::Prevote(ref mut vote) =>
}
},
finality_grandpa::Message::Prevote(ref mut vote) => {
if let Some(prevote) = self.has_voted.prevote() {
*vote = prevote.clone();
},
finality_grandpa::Message::Precommit(ref mut vote) =>
}
},
finality_grandpa::Message::Precommit(ref mut vote) => {
if let Some(precommit) = self.has_voted.precommit() {
*vote = precommit.clone();
},
}
},
}
// when locals exist, sign messages on import