chore: apply contract abi changes

synapseweb3 · Dec 20, 2023 · 1beab23 · 1beab23
1 parent 2886cf4
commit 1beab23
Show file tree

Hide file tree

Showing 5 changed files with 15,931 additions and 98,683 deletions.
diff --git a/.github/workflows/ibc-test.yaml b/.github/workflows/ibc-test.yaml
@@ -30,7 +30,7 @@ jobs:
       SRC_DIR: ${{ github.workspace }}/ibc-test-src
       # https://github.com/axonweb3/axon/commits/forcerelay-dev
       AXON_COMMIT: 343f329b78b8187e28fdac9e9af6c28222656b92
-      IBC_CONTRACT_COMMIT: c5417573ec15c8aaab048caa1ec5f3bd50c2170e
+      IBC_CONTRACT_COMMIT: f2bd40fe3d314bb8fa55c828e9832f40a350fa48
       CELL_EMITTER_COMMIT: 0a897111b389472a078512815d293703910c25d5
     strategy:
       fail-fast: false

diff --git a/crates/relayer/src/chain/axon/contract/OwnableIBCHandler.json b/crates/relayer/src/chain/axon/contract/OwnableIBCHandler.json
diff --git a/crates/relayer/src/chain/axon/contract/generate.rs b/crates/relayer/src/chain/axon/contract/generate.rs
diff --git a/tools/ibc-test/src/framework/binary/node.rs b/tools/ibc-test/src/framework/binary/node.rs
@@ -57,12 +57,12 @@ where
             let axon_port = node_a.chain_driver.rpc_port;
             let ckb_port = node_b.chain_driver.rpc_port;
             println!("start cell-emiter for Axon:{axon_port} and CKB:{ckb_port}");
-            prepare_cell_emitter(axon_port, ckb_port);
+            prepare_cell_emitter(axon_port, ckb_port)?;
         } else if matches!(chain_types, (&ChainType::Ckb, &ChainType::Axon)) {
             let axon_port = node_b.chain_driver.rpc_port;
             let ckb_port = node_a.chain_driver.rpc_port;
             println!("start cell-emiter for Axon:{axon_port} and CKB:{ckb_port}");
-            prepare_cell_emitter(axon_port, ckb_port);
+            prepare_cell_emitter(axon_port, ckb_port)?;
         }
 
         eprintln!("Node is initialized, Starting running inner test..........");

diff --git a/tools/ibc-test/src/framework/utils/common.rs b/tools/ibc-test/src/framework/utils/common.rs
@@ -65,11 +65,13 @@ pub fn transfer_port_id(chain_type: ChainType) -> PortId {
     }
 }
 
-pub fn prepare_cell_emitter(axon_port: u16, ckb_port: u16) {
+pub fn prepare_cell_emitter(axon_port: u16, ckb_port: u16) -> Result<(), Error> {
     let listen_port = rngs::OsRng.gen_range(9000..10000);
     let store_path = std::env::current_dir()
         .unwrap()
-        .join(format!("emitter/store-{listen_port}"));
+        .join(format!("emitter-store-{listen_port}"));
+    std::fs::create_dir(&store_path)
+        .map_err(|err| eyre!("failed to create emitter store path: {err}"))?;
     Command::new("emitter")
         .arg("-c")
         .arg(format!("http://localhost:{ckb_port}"))
@@ -81,5 +83,6 @@ pub fn prepare_cell_emitter(axon_port: u16, ckb_port: u16) {
         .arg(store_path)
         .stdout(Stdio::null())
         .spawn()
-        .expect("cell emitter");
+        .map_err(|err| eyre!("failed to start emitter: {err}"))?;
+    Ok(())
 }