Merge remote-tracking branch 'origin/main' into dowlandaiello/enhance…

…ment-instantiate2

README.md

@@ -227,4 +227,4 @@ Note that most `tx_*` helper functions expose a `.with_key(key: &str)` builder f
 
 ### Complete Example
 
-Examples of using almost every helper function provided by this repository are available in the [examples](https://github.com/timewave-computer/tree/main/examples) directory.
+Examples of using almost every helper function provided by this repository are available in the [examples](https://github.com/timewave-computer/localic-utils/tree/main/examples) directory.

examples/neutron_osmosis.rs

@@ -1,5 +1,5 @@
 use localic_utils::{ConfigChainBuilder, TestContextBuilder};
-use std::error::Error;
+use std::{error::Error, thread, time::Duration};
 
 const ACC_0_ADDR: &str = "osmo1hj5fveer5cjtn4wd6wstzugjfdxzl0xpwhpz63";
 const NEUTRON_ACC_0_ADDR: &str = "neutron1hj5fveer5cjtn4wd6wstzugjfdxzl0xpznmsky";
@@ -18,6 +18,16 @@ fn main() -> Result<(), Box<dyn Error>> {
         .with_transfer_channels("osmosis", "neutron")
         .build()?;
 
+    // Kill and restart the relayer
+    ctx.stop_relayer();
+    ctx.start_relayer();
+
+    // Wait for the relayer to start up
+    thread::sleep(Duration::from_secs(10));
+
+    // Wait for some blocks
+    ctx.get_chain("neutron").wait_for_blocks(20);
+
     ctx.build_tx_create_tokenfactory_token()
         .with_chain_name("neutron")
         .with_subdenom("bruhtoken")

src/utils/setup/ibc.rs

@@ -1,5 +1,7 @@
 use super::super::{
-    super::{error::Error, DEFAULT_KEY, DEFAULT_TRANSFER_PORT, NEUTRON_CHAIN_NAME},
+    super::{
+        error::Error, DEFAULT_KEY, DEFAULT_TRANSFER_PORT, NEUTRON_CHAIN_ID, NEUTRON_CHAIN_NAME,
+    },
     test_context::{LocalChain, TestContext},
 };
 
@@ -134,4 +136,32 @@ impl TestContext {
 
         Ok(())
     }
+
+    pub fn start_relayer(&mut self) {
+        // Any random chain will allow us to kill the relayer,
+        // so select any chain we can get the API URL from
+        let chain = self.chains.values().next().unwrap();
+
+        // See above. chain_id does not matter, since there is
+        // one relayer running
+        reqwest::blocking::Client::default()
+            .post(&chain.rb.api)
+            .json(&serde_json::json!({ "chain_id": NEUTRON_CHAIN_ID, "action": "start-relayer"}))
+            .send()
+            .unwrap();
+    }
+
+    pub fn stop_relayer(&mut self) {
+        // Any random chain will allow us to kill the relayer,
+        // so select any chain we can get the API URL from
+        let chain = self.chains.values().next().unwrap();
+
+        // See above. chain_id does not matter, since there is
+        // one relayer running
+        reqwest::blocking::Client::default()
+            .post(&chain.rb.api)
+            .json(&serde_json::json!({ "chain_id": NEUTRON_CHAIN_ID, "action": "stop-relayer"}))
+            .send()
+            .unwrap();
+    }
 }

src/utils/test_context.rs

@@ -5,7 +5,9 @@ use super::super::{
 };
 
 use localic_std::{
-    modules::cosmwasm::CosmWasm, relayer::Channel, relayer::Relayer,
+    modules::cosmwasm::CosmWasm,
+    node::Chain,
+    relayer::{Channel, Relayer},
     transactions::ChainRequestBuilder,
 };
 use serde_json::Value;
@@ -401,6 +403,15 @@ impl LocalChain {
         let id = abs_path.file_stem().unwrap().to_str().unwrap();
         self.contract_codes.insert(id.to_string(), code);
     }
+
+    pub fn wait_for_blocks(&self, blocks: u64) {
+        let chain = Chain::new(&self.rb);
+        let current_height = chain.get_height();
+
+        while chain.get_height() < current_height + blocks {
+            std::thread::sleep(std::time::Duration::from_millis(500));
+        }
+    }
 }
 
 impl TestContext {