Rename bitcoin-move light_client.move to bitcoin.move (#1649)

* Rename bitcoin-move light_client.move to bitcoin.move * fixup
rooch-network · May 6, 2024 · 5e0c120 · 5e0c120
1 parent 5c0d754
commit 5e0c120
Show file tree

Hide file tree

Showing 14 changed files with 380 additions and 396 deletions.
diff --git a/crates/rooch-executor/src/actor/executor.rs b/crates/rooch-executor/src/actor/executor.rs
@@ -23,7 +23,7 @@ use moveos_types::transaction::{FunctionCall, MoveOSTransaction, VerifiedMoveAct
 use rooch_genesis::FrameworksGasParameters;
 use rooch_store::RoochStore;
 use rooch_types::address::MultiChainAddress;
-use rooch_types::bitcoin::light_client::BitcoinLightClientModule;
+use rooch_types::bitcoin::BitcoinModule;
 use rooch_types::framework::address_mapping::AddressMappingModule;
 use rooch_types::framework::auth_validator::{AuthValidatorCaller, TxValidateResult};
 use rooch_types::framework::ethereum_light_client::EthereumLightClientModule;
@@ -130,7 +130,7 @@ impl ExecutorActor {
         match RoochMultiChainID::try_from(chain_id.id())? {
             RoochMultiChainID::Bitcoin => {
                 let action = VerifiedMoveAction::Function {
-                    call: BitcoinLightClientModule::create_submit_new_block_call_bytes(
+                    call: BitcoinModule::create_submit_new_block_call_bytes(
                         block_height,
                         block_hash,
                         block_body,

diff --git a/...ts/src/tests/bitcoin_light_client_test.rs → ...framework-tests/src/tests/bitcoin_test.rs b/...ts/src/tests/bitcoin_light_client_test.rs → ...framework-tests/src/tests/bitcoin_test.rs
@@ -46,29 +46,18 @@ fn test_submit_block() {
         .unwrap();
 
     // let moveos = binding_test.reader_executor.moveos().read();
-    let bitcoin_light_client_module = binding_test
-        .as_module_binding::<rooch_types::bitcoin::light_client::BitcoinLightClientModule>(
-    );
+    let bitcoin_module = binding_test.as_module_binding::<rooch_types::bitcoin::BitcoinModule>();
     assert_eq!(
-        bitcoin_light_client_module
-            .get_block(block_hash)
-            .unwrap()
-            .unwrap(),
+        bitcoin_module.get_block(block_hash).unwrap().unwrap(),
         block_header
     );
 
     assert_eq!(
-        bitcoin_light_client_module
-            .get_block_by_height(height)
-            .unwrap()
-            .unwrap(),
+        bitcoin_module.get_block_by_height(height).unwrap().unwrap(),
         block_header
     );
     assert_eq!(
-        bitcoin_light_client_module
-            .get_latest_block_height()
-            .unwrap()
-            .unwrap(),
+        bitcoin_module.get_latest_block_height().unwrap().unwrap(),
         height
     );
     println!("txdata len: {}", bitcoin_txdata.len());
@@ -88,7 +77,7 @@ fn test_submit_block() {
 }
 
 //this test takes too long time in debug mod run it in release mod, use command:
-//RUST_LOG=debug cargo test --release --package rooch-framework-tests --lib -- --include-ignored tests::bitcoin_light_client_test::test_utxo_progress
+//RUST_LOG=debug cargo test --release --package rooch-framework-tests --lib -- --include-ignored tests::bitcoin_test::test_utxo_progress
 #[test]
 fn test_utxo_progress() {
     let _ = tracing_subscriber::fmt::try_init();

diff --git a/crates/rooch-framework-tests/src/tests/mod.rs b/crates/rooch-framework-tests/src/tests/mod.rs
@@ -1,7 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
-mod bitcoin_light_client_test;
+mod bitcoin_test;
 mod brc20_test;
 mod chain_id_test;
 mod empty_tests;

diff --git a/crates/rooch-relayer/src/actor/bitcoin_relayer.rs b/crates/rooch-relayer/src/actor/bitcoin_relayer.rs
@@ -12,7 +12,7 @@ use moveos_types::module_binding::MoveFunctionCaller;
 use rooch_config::BitcoinRelayerConfig;
 use rooch_executor::proxy::ExecutorProxy;
 use rooch_types::{
-    bitcoin::light_client::BitcoinLightClientModule,
+    bitcoin::BitcoinModule,
     multichain_id::RoochMultiChainID,
     transaction::{L1Block, L1BlockWithBody},
 };
@@ -67,10 +67,8 @@ impl BitcoinRelayer {
             return Ok(());
         }
         self.latest_sync_timestamp = chrono::Utc::now().timestamp() as u64;
-        let bitcoin_light_client = self
-            .move_caller
-            .as_module_binding::<BitcoinLightClientModule>();
-        let latest_block_height_in_rooch = bitcoin_light_client.get_latest_block_height()?;
+        let bitcoin_module = self.move_caller.as_module_binding::<BitcoinModule>();
+        let latest_block_height_in_rooch = bitcoin_module.get_latest_block_height()?;
         let latest_block_hash_in_bitcoin = self.rpc_client.get_best_block_hash().await?;
         let latest_block_header_info = self
             .rpc_client

diff --git a/crates/rooch-types/src/bitcoin/light_client.rs b/crates/rooch-types/src/bitcoin/light_client.rs