[rooch-networkgh-771] fix tests.

feliciss · Oct 28, 2023 · 8aaa04c · 8aaa04c
1 parent 3fd7ea5
commit 8aaa04c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/crates/rooch-framework-tests/src/tests/ethereum_light_client_test.rs b/crates/rooch-framework-tests/src/tests/ethereum_light_client_test.rs
@@ -53,7 +53,7 @@ fn test_submit_block() {
 
     let block_header = BlockHeader::try_from(&ethereum_block).unwrap();
     let action = MoveAction::Function(rooch_types::framework::ethereum_light_client::EthereumLightClientModule::create_submit_new_block_call(&block_header));
-    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number, action);
+    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number, H256::zero(), action);
     let tx = keystore.sign_transaction(&sender, tx_data, None).unwrap();
     binding_test.execute(tx).unwrap();
 

diff --git a/crates/rooch-framework-tests/src/tests/ethereum_validator_tests.rs b/crates/rooch-framework-tests/src/tests/ethereum_validator_tests.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use ethers::types::{Bytes, U256};
+use moveos_types::h256::H256;
 use moveos_types::transaction::MoveAction;
 use rooch_key::keystore::account_keystore::AccountKeystore;
 use rooch_key::keystore::memory_keystore::InMemKeystore;
@@ -33,7 +34,7 @@ fn test_validate() {
         .resolve_or_generate(multi_chain_address_sender.clone())
         .unwrap();
     let authenticator = tx.authenticator_info().unwrap();
-    let moveos_tx = tx.construct_moveos_transaction(resolved_sender).unwrap();
+    let moveos_tx = tx.construct_moveos_transaction(resolved_sender, H256::zero()).unwrap();
 
     ethereum_validator
         .validate(&moveos_tx.ctx, authenticator.authenticator.payload)

diff --git a/crates/rooch-framework-tests/src/tests/native_validator_tests.rs b/crates/rooch-framework-tests/src/tests/native_validator_tests.rs
@@ -1,6 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
+use moveos_types::h256::H256;
 use moveos_types::transaction::MoveAction;
 use rooch_key::keystore::account_keystore::AccountKeystore;
 use rooch_key::keystore::memory_keystore::InMemKeystore;
@@ -20,10 +21,10 @@ fn test_validate() {
     let sender = keystore.addresses()[0];
     let sequence_number = 0;
     let action = MoveAction::new_function_call(Empty::empty_function_id(), vec![], vec![]);
-    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number, action);
+    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number, H256::zero(), action);
     let tx = keystore.sign_transaction(&sender, tx_data, None).unwrap();
     let auth_info = tx.authenticator_info().unwrap();
-    let move_tx = tx.construct_moveos_transaction(sender.into()).unwrap();
+    let move_tx = tx.construct_moveos_transaction(sender.into(), H256::zero()).unwrap();
 
     native_validator
         .validate(&move_tx.ctx, auth_info.authenticator.payload)

diff --git a/crates/rooch-framework-tests/src/tests/transaction_validator_tests.rs b/crates/rooch-framework-tests/src/tests/transaction_validator_tests.rs
@@ -7,6 +7,7 @@ use move_core_types::ident_str;
 use move_core_types::language_storage::ModuleId;
 use move_core_types::value::MoveValue;
 use move_core_types::vm_status::{AbortLocation, VMStatus};
+use moveos_types::h256::H256;
 use moveos_types::move_types::FunctionId;
 use moveos_types::{module_binding::ModuleBinding, transaction::MoveAction};
 use rooch_key::keystore::account_keystore::AccountKeystore;
@@ -33,10 +34,10 @@ fn test_validate_rooch() {
     let sender = keystore.addresses()[0];
     let sequence_number = 0;
     let action = MoveAction::new_function_call(Empty::empty_function_id(), vec![], vec![]);
-    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number, action);
+    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number, H256::zero(), action);
     let tx = keystore.sign_transaction(&sender, tx_data, None).unwrap();
     let auth_info = tx.authenticator_info().unwrap();
-    let move_tx = tx.construct_moveos_transaction(sender.into()).unwrap();
+    let move_tx = tx.construct_moveos_transaction(sender.into(), H256::zero()).unwrap();
 
     transaction_validator
         .validate(&move_tx.ctx, auth_info)
@@ -67,7 +68,7 @@ fn test_validate_ethereum() {
         .resolve_or_generate(multi_chain_address_sender.clone())
         .unwrap();
     let authenticator = tx.authenticator_info().unwrap();
-    let moveos_tx = tx.construct_moveos_transaction(resolved_sender).unwrap();
+    let moveos_tx = tx.construct_moveos_transaction(resolved_sender, H256::zero()).unwrap();
 
     transaction_validator
         .validate(&moveos_tx.ctx, authenticator)
@@ -98,7 +99,7 @@ fn test_session_key_rooch() {
         session_scope.clone(),
         max_inactive_interval,
     );
-    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number, action);
+    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number, H256::zero(), action);
     let tx = keystore.sign_transaction(&sender, tx_data, None).unwrap();
     binding_test.execute(tx).unwrap();
 
@@ -116,7 +117,7 @@ fn test_session_key_rooch() {
     // send transaction via session key
 
     let action = MoveAction::new_function_call(Empty::empty_function_id(), vec![], vec![]);
-    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number + 1, action);
+    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number + 1, H256::zero(), action);
     let tx = keystore
         .sign_transaction_via_session_key(&sender, tx_data, &session_auth_key, None)
         .unwrap();
@@ -135,7 +136,7 @@ fn test_session_key_rooch() {
             .simple_serialize()
             .unwrap()],
     );
-    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number + 2, action);
+    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number + 2, H256::zero(), action);
     let tx = keystore
         .sign_transaction_via_session_key(&sender, tx_data, &session_auth_key, None)
         .unwrap();
@@ -169,12 +170,12 @@ fn test_session_key_rooch() {
         TimestampModule::create_fast_forward_seconds_for_local_action(max_inactive_interval + 1);
     // because previous transaction is failed, so the sequence number is not increased.
     let tx_data =
-        RoochTransactionData::new_for_test(sender, sequence_number + 2, update_time_action);
+        RoochTransactionData::new_for_test(sender, sequence_number + 2, H256::zero(), update_time_action);
     let tx = keystore.sign_transaction(&sender, tx_data, None).unwrap();
     binding_test.execute(tx).unwrap();
 
     let action = MoveAction::new_function_call(Empty::empty_function_id(), vec![], vec![]);
-    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number + 3, action);
+    let tx_data = RoochTransactionData::new_for_test(sender, sequence_number + 3, H256::zero(), action);
     let tx = keystore
         .sign_transaction_via_session_key(&sender, tx_data, &session_auth_key, None)
         .unwrap();