chore: bump ckb-merkle-mountain-range to 0.5.0

nervosnetwork · Aug 3, 2022 · 456ff7c · 456ff7c
1 parent 79276d1
commit 456ff7c
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/Cargo.toml b/chain/Cargo.toml
@@ -27,7 +27,7 @@ ckb-app-config = { path = "../util/app-config", version = "= 0.105.0-pre" }
 ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.105.0-pre" }
 ckb-channel = { path = "../util/channel", version = "= 0.105.0-pre" }
 faux = { version = "^0.1", optional = true }
-ckb-merkle-mountain-range = "0.4.0"
+ckb-merkle-mountain-range = "0.5.0"
 
 [dev-dependencies]
 ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.105.0-pre" }

diff --git a/store/Cargo.toml b/store/Cargo.toml
@@ -19,7 +19,7 @@ ckb-error = { path = "../error", version = "= 0.105.0-pre" }
 ckb-app-config = { path = "../util/app-config", version = "= 0.105.0-pre" }
 ckb-db-schema = { path = "../db-schema", version = "= 0.105.0-pre" }
 ckb-freezer = { path = "../freezer", version = "= 0.105.0-pre" }
-ckb-merkle-mountain-range = "0.4.0"
+ckb-merkle-mountain-range = "0.5.0"
 
 [dev-dependencies]
 tempfile = "3.0"

diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml
@@ -36,7 +36,7 @@ sentry = { version = "0.26.0", optional = true }
 serde_json = "1.0"
 rand = "0.8.4"
 hyper = { version = "0.14", features = ["http1", "client", "tcp"] }
-ckb-merkle-mountain-range = "0.4.0"
+ckb-merkle-mountain-range = "0.5.0"
 
 [dev-dependencies]
 tempfile = "3.0"

diff --git a/tx-pool/src/block_assembler/mod.rs b/tx-pool/src/block_assembler/mod.rs
@@ -450,21 +450,6 @@ impl BlockAssembler {
             config.message.as_bytes().pack()
         };
 
-        // let message = if config.use_binary_version_as_message_prefix {
-        //     if config.message.is_empty() {
-        //         config.binary_version.as_bytes().pack()
-        //     } else {
-        //         [
-        //             config.binary_version.as_bytes(),
-        //             b" ",
-        //             config.message.as_bytes(),
-        //         ]
-        //         .concat()
-        //         .pack()
-        //     }
-        // } else {
-        //     config.message.as_bytes().pack()
-        // };
         CellbaseWitness::new_builder()
             .lock(cellbase_lock)
             .message(message)

diff --git a/util/light-client-protocol-server/Cargo.toml b/util/light-client-protocol-server/Cargo.toml
@@ -14,4 +14,4 @@ ckb-sync = { path = "../../sync", version = "= 0.105.0-pre" }
 ckb-shared = { path = "../../shared", version = "= 0.105.0-pre" }
 ckb-logger = { path = "../logger", version = "= 0.105.0-pre" }
 ckb-types = { path = "../types", version = "= 0.105.0-pre" }
-ckb-merkle-mountain-range = "0.4.0"
+ckb-merkle-mountain-range = "0.5.0"
diff --git a/util/snapshot/Cargo.toml b/util/snapshot/Cargo.toml
@@ -20,7 +20,7 @@ ckb-proposal-table = { path = "../proposal-table", version = "= 0.105.0-pre" }
 arc-swap = "1.3"
 ckb-db-schema = { path = "../../db-schema", version = "= 0.105.0-pre" }
 ckb-freezer = { path = "../../freezer", version = "= 0.105.0-pre" }
-ckb-merkle-mountain-range = "0.4.0"
+ckb-merkle-mountain-range = "0.5.0"
 
 [features]
 portable = [

diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml
@@ -22,7 +22,7 @@ ckb-error = { path = "../../error", version = "= 0.105.0-pre" }
 ckb-rational = { path = "../rational", version = "= 0.105.0-pre" }
 once_cell = "1.8.0"
 derive_more = { version = "0.99.0", default-features=false, features = ["display"] }
-ckb-merkle-mountain-range = "0.4.0"
+ckb-merkle-mountain-range = "0.5.0"
 
 [dev-dependencies]
 proptest = "1.0"
diff --git a/verification/contextual/Cargo.toml b/verification/contextual/Cargo.toml
@@ -24,7 +24,7 @@ tokio = { version = "1", features = ["sync", "rt-multi-thread"] }
 ckb-async-runtime = { path = "../../util/runtime", version = "= 0.105.0-pre" }
 ckb-verification-traits = { path = "../traits", version = "= 0.105.0-pre" }
 ckb-verification = { path = "..", version = "= 0.105.0-pre" }
-ckb-merkle-mountain-range = "0.4.0"
+ckb-merkle-mountain-range = "0.5.0"
 
 [dev-dependencies]
 ckb-chain = { path = "../../chain", version = "= 0.105.0-pre" }

diff --git a/verification/contextual/src/contextual_block_verifier.rs b/verification/contextual/src/contextual_block_verifier.rs
@@ -517,7 +517,7 @@ impl<'a> EpochVerifier<'a> {
 ///
 /// Check block extension.
 #[derive(Clone)]
-pub struct BlockExtensionVerifier<'a, 'b, CS, MS: MMRStore<HeaderDigest>> {
+pub struct BlockExtensionVerifier<'a, 'b, CS, MS> {
     context: &'a VerifyContext<'a, CS>,
     chain_root_mmr: &'a ChainRootMMR<MS>,
     parent: &'b HeaderView,
@@ -602,7 +602,7 @@ impl<'a, 'b, CS: ChainStore<'a> + VersionBitsIndexer, MS: MMRStore<HeaderDigest>
 /// - [`DaoHeaderVerifier`](./struct.DaoHeaderVerifier.html)
 /// - [`RewardVerifier`](./struct.RewardVerifier.html)
 /// - [`BlockTxsVerifier`](./struct.BlockTxsVerifier.html)
-pub struct ContextualBlockVerifier<'a, CS, MS: MMRStore<HeaderDigest>> {
+pub struct ContextualBlockVerifier<'a, CS, MS> {
     context: &'a VerifyContext<'a, CS>,
     switch: Switch,
     handle: &'a Handle,

diff --git a/verification/contextual/src/tests/block_extension_verifier.rs b/verification/contextual/src/tests/block_extension_verifier.rs