Fix neutron example.

timewave-computer · Sep 6, 2024 · c4e3772 · c4e3772
1 parent 7e13dc9
commit c4e3772
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 6 deletions.
diff --git a/examples/contracts_osmosis/astroport_factory_osmosis.wasm b/examples/contracts_osmosis/astroport_factory_osmosis.wasm
diff --git a/examples/contracts_osmosis/astroport_maker_osmosis.wasm b/examples/contracts_osmosis/astroport_maker_osmosis.wasm
diff --git a/examples/contracts_osmosis/astroport_native_coin_registry.wasm b/examples/contracts_osmosis/astroport_native_coin_registry.wasm
diff --git a/examples/contracts_osmosis/astroport_pcl_osmo.wasm b/examples/contracts_osmosis/astroport_pcl_osmo.wasm
diff --git a/examples/contracts_osmosis/auction.wasm b/examples/contracts_osmosis/auction.wasm
diff --git a/examples/contracts_osmosis/auctions_manager.wasm b/examples/contracts_osmosis/auctions_manager.wasm
diff --git a/examples/contracts_osmosis/cw1_whitelist.wasm b/examples/contracts_osmosis/cw1_whitelist.wasm
diff --git a/examples/contracts_osmosis/cw20_base.wasm b/examples/contracts_osmosis/cw20_base.wasm
diff --git a/examples/contracts_osmosis/price_oracle.wasm b/examples/contracts_osmosis/price_oracle.wasm
diff --git a/examples/neutron.rs b/examples/neutron.rs
@@ -9,8 +9,8 @@ const ARTIFACTS_DIR: &str = "contracts";
 const ACC_0_ADDR: &str = "neutron1hj5fveer5cjtn4wd6wstzugjfdxzl0xpznmsky";
 const LOCAL_CODE_ID_CACHE_PATH: &str = "code_id_cache.json";
 
-const TEST_TOKEN_1_NAME: &str = "bruhtoken3";
-const TEST_TOKEN_2_NAME: &str = "amoguscoin3";
+const TEST_TOKEN_1_NAME: &str = "bruhtokent13";
+const TEST_TOKEN_2_NAME: &str = "amoguscoin13";
 
 /// Demonstrates using localic-utils for neutron.
 fn main() -> Result<(), Box<dyn Error>> {

diff --git a/src/utils/queries.rs b/src/utils/queries.rs
@@ -153,10 +153,10 @@ impl<'a> TestContextQuery<'a> {
     pub fn get_cw(self) -> CosmWasm<'a> {
         match self.query_type {
             QueryType::Contract => self.get_contract(),
-            QueryType::Factory
-            | QueryType::Auction
-            | QueryType::PriceOracle
-            | QueryType::AuctionsManager => self.get_deployed_contract(),
+            QueryType::Auction => self.get_auction(),
+            QueryType::Factory | QueryType::PriceOracle | QueryType::AuctionsManager => {
+                self.get_deployed_contract()
+            }
             QueryType::AstroPool => self.get_astro_pool(),
             QueryType::TransferChannel
             | QueryType::Connection
@@ -408,6 +408,34 @@ impl<'a> TestContextQuery<'a> {
         ))
     }
 
+    fn get_auction(&self) -> Option<CosmWasm<'a>> {
+        let auction_manager = self
+            .context
+            .get_auctions_manager()
+            .src(self.src_chain.as_deref()?)
+            .get_cw();
+        let denoms = (self.offer_asset.as_deref()?, self.ask_asset.as_deref()?);
+
+        let resp = auction_manager.query(
+            &serde_json::to_string(&serde_json::json!({
+                "get_pair_addr": {
+                    "pair": denoms,
+                }}
+            ))
+            .unwrap(),
+        );
+
+        let mut cw = self
+            .context
+            .get_contract()
+            .contract(PAIR_NAME)
+            .src(self.src_chain.as_deref()?)
+            .get_cw();
+        cw.contract_addr = Some(resp["data"].as_str()?.to_owned());
+
+        Some(cw)
+    }
+
     fn get_astro_pool(&self) -> Option<CosmWasm<'a>> {
         let (denom_a, denom_b) = self.denoms.as_ref()?;
         let factory = self