fix mpm and executor test (#4276)

starcoinorg · Nov 12, 2024 · 014122c · 014122c
1 parent 03acd54
commit 014122c
Show file tree

Hide file tree

Showing 13 changed files with 187 additions and 173 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -20,6 +20,7 @@ futures-timer = { workspace = true }
 starcoin-logger = { workspace = true }
 parking_lot = { workspace = true }
 proptest = { workspace = true }
+rand_0_7_3 = { workspace = true }
 rand = { workspace = true }
 rand_core = { default-features = false, workspace = true }
 starcoin-account-api = { workspace = true }
@@ -62,4 +63,4 @@ harness = false
 name = "bench_vm"
 
 [target."cfg(target_os=\"linux\")".dependencies]
-pprof = { version = "0.10", features = ["flamegraph", "criterion"] }
+pprof = { version = "0.10", features = ["flamegraph", "criterion"] }
diff --git a/benchmarks/benches/bench_state_tree.rs b/benchmarks/benches/bench_state_tree.rs
@@ -6,7 +6,7 @@ use forkable_jellyfish_merkle::blob::Blob;
 use forkable_jellyfish_merkle::HashValueKey;
 #[cfg(target_os = "linux")]
 use pprof::criterion::{Output, PProfProfiler};
-use rand::{rngs::StdRng, SeedableRng};
+use rand_0_7_3::{prelude::StdRng, SeedableRng};
 use starcoin_config::RocksdbConfig;
 use starcoin_crypto::hash::*;
 use starcoin_state_store_api::StateNodeStore;

diff --git a/commons/forkable-jellyfish-merkle/Cargo.toml b/commons/forkable-jellyfish-merkle/Cargo.toml
@@ -24,7 +24,7 @@ bcs = { workspace = true }
 criterion = { workspace = true }
 proptest = { workspace = true }
 proptest-derive = { workspace = true }
-rand_0_7_3= { workspace = true }
+rand_0_7_3 = { workspace = true }
 rand_core = { default-features = false, workspace = true }
 starcoin-crypto = { workspace = true }
 

diff --git a/commons/forkable-jellyfish-merkle/src/jellyfish_merkle_test.rs b/commons/forkable-jellyfish-merkle/src/jellyfish_merkle_test.rs
@@ -669,15 +669,15 @@ fn many_versions_get_proof_and_verify_tree_root(seed: &[u8], num_versions: usize
     }
 
     for (i, (k, v, _)) in kvs.iter().enumerate() {
-        let random_version = rng.gen_range(i..i + num_versions);
+        let random_version = rng.gen_range(i, i + num_versions);
         let history_root = roots[random_version];
         let (value, proof) = tree.get_with_proof(history_root, *k).unwrap();
         assert_eq!(value.unwrap(), *v);
         assert!(proof.verify(history_root, *k, Some(v)).is_ok());
     }
 
     for (i, (k, _, v)) in kvs.iter().enumerate() {
-        let random_version = rng.gen_range(i + num_versions..2 * num_versions);
+        let random_version = rng.gen_range(i + num_versions, 2 * num_versions);
         let history_root = roots[random_version];
         let (value, proof) = tree.get_with_proof(history_root, *k).unwrap();
         assert_eq!(value.unwrap(), *v);

diff --git a/executor/tests/block_reward_test.rs b/executor/tests/block_reward_test.rs
@@ -28,7 +28,6 @@ fn test_block_reward() -> Result<()> {
                 HashValue::zero(),
                 block_timestamp,
                 *alice.address(),
-                Some(alice.auth_key()),
                 0,
                 block_number,
                 net.chain_id(),
@@ -48,7 +47,6 @@ fn test_block_reward() -> Result<()> {
                 HashValue::zero(),
                 block_timestamp,
                 *bob.address(),
-                Some(bob.auth_key()),
                 0,
                 block_number,
                 net.chain_id(),
@@ -74,7 +72,6 @@ fn test_block_reward() -> Result<()> {
                 HashValue::zero(),
                 block_timestamp,
                 *alice.address(),
-                Some(alice.auth_key()),
                 0,
                 block_number,
                 net.chain_id(),

diff --git a/executor/tests/error_code_test.rs b/executor/tests/error_code_test.rs
@@ -49,7 +49,6 @@ fn test_block_metadata_error_code() -> Result<()> {
         starcoin_crypto::HashValue::random(),
         net.time_service().now_millis(),
         *account1.address(),
-        Some(account1.auth_key()),
         0,
         1,
         net.chain_id(),
@@ -66,7 +65,6 @@ fn test_block_metadata_error_code() -> Result<()> {
         starcoin_crypto::HashValue::random(),
         net.time_service().now_millis(),
         *account1.address(),
-        Some(account1.auth_key()),
         0,
         3, //EBLOCK_NUMBER_MISMATCH
         net.chain_id(),
@@ -83,7 +81,6 @@ fn test_block_metadata_error_code() -> Result<()> {
         starcoin_crypto::HashValue::random(),
         0, //EINVALID_TIMESTAMP
         *account1.address(),
-        Some(account1.auth_key()),
         0,
         2,
         net.chain_id(),
@@ -144,7 +141,7 @@ fn test_execute_transfer_txn_with_wrong_token_code() -> Result<()> {
         net.chain_id(),
     );
 
-    let txn2 = Transaction::UserTransaction(account1.sign_txn(raw_txn));
+    let txn2 = Transaction::UserTransaction(account1.sign_txn(raw_txn)?);
     let output = starcoin_executor::execute_transactions(&chain_state, vec![txn2], None).unwrap();
     assert_eq!(
         KeptVMStatus::MiscellaneousError,
@@ -179,7 +176,7 @@ fn test_execute_transfer_txn_with_dummy_gas_token_code() -> Result<()> {
         net.chain_id(),
     );
 
-    let txn2 = Transaction::UserTransaction(account1.sign_txn(raw_txn));
+    let txn2 = Transaction::UserTransaction(account1.sign_txn(raw_txn)?);
     let output = execute_and_apply(&chain_state, txn2);
     assert_eq!(
         TransactionStatus::Discard(StatusCode::BAD_TRANSACTION_FEE_CURRENCY),