Merge pull request #27 from timewave-computer/dowlandaiello/refactor-…

…querybuilder-micro Refactor TestContext Queries to All Use Builder Pattern
timewave-computer · Sep 6, 2024 · 60006f6 · 60006f6
2 parents a8351bc + 73c2fbb
commit 60006f6
Show file tree

Hide file tree

Showing 17 changed files with 661 additions and 497 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 = "bruhtoken";
+const TEST_TOKEN_2_NAME: &str = "amoguscoin";
 
 /// Demonstrates using localic-utils for neutron.
 fn main() -> Result<(), Box<dyn Error>> {
@@ -39,8 +39,16 @@ fn main() -> Result<(), Box<dyn Error>> {
         .with_subdenom(TEST_TOKEN_2_NAME)
         .send()?;
 
-    let bruhtoken = ctx.get_tokenfactory_denom(ACC_0_ADDR, TEST_TOKEN_1_NAME);
-    let amoguscoin = ctx.get_tokenfactory_denom(ACC_0_ADDR, TEST_TOKEN_2_NAME);
+    let bruhtoken = ctx
+        .get_tokenfactory_denom()
+        .creator(ACC_0_ADDR)
+        .subdenom(TEST_TOKEN_1_NAME.to_owned())
+        .get();
+    let amoguscoin = ctx
+        .get_tokenfactory_denom()
+        .creator(ACC_0_ADDR)
+        .subdenom(TEST_TOKEN_2_NAME.to_owned())
+        .get();
 
     // Deploy valence auctions
     ctx.build_tx_create_auctions_manager()
@@ -81,14 +89,26 @@ fn main() -> Result<(), Box<dyn Error>> {
         .with_amount_offer_asset(10000)
         .send()?;
 
-    ctx.get_auction((
-        "untrn",
-        ctx.get_tokenfactory_denom(ACC_0_ADDR, TEST_TOKEN_1_NAME),
-    ))?;
-    ctx.get_auction((
-        "untrn",
-        ctx.get_tokenfactory_denom(ACC_0_ADDR, TEST_TOKEN_2_NAME),
-    ))?;
+    let _ = ctx
+        .get_auction()
+        .offer_asset("untrn")
+        .ask_asset(
+            &ctx.get_tokenfactory_denom()
+                .creator(ACC_0_ADDR)
+                .subdenom(TEST_TOKEN_1_NAME.to_owned())
+                .get(),
+        )
+        .get_cw();
+    let _ = ctx
+        .get_auction()
+        .offer_asset("untrn")
+        .ask_asset(
+            &ctx.get_tokenfactory_denom()
+                .creator(ACC_0_ADDR)
+                .subdenom(TEST_TOKEN_2_NAME.to_owned())
+                .get(),
+        )
+        .get_cw();
 
     ctx.build_tx_create_token_registry()
         .with_owner(ACC_0_ADDR)
@@ -105,10 +125,16 @@ fn main() -> Result<(), Box<dyn Error>> {
         .with_denom_b(bruhtoken)
         .send()?;
 
-    let pool = ctx.get_astroport_pool(
-        "untrn",
-        ctx.get_tokenfactory_denom(ACC_0_ADDR, TEST_TOKEN_2_NAME),
-    )?;
+    let pool = ctx
+        .get_astro_pool()
+        .denoms(
+            "untrn".to_owned(),
+            ctx.get_tokenfactory_denom()
+                .creator(ACC_0_ADDR)
+                .subdenom(TEST_TOKEN_2_NAME.to_owned())
+                .get(),
+        )
+        .get_cw();
 
     assert!(pool
         .query_value(&serde_json::json!({
@@ -140,8 +166,9 @@ fn main() -> Result<(), Box<dyn Error>> {
         .send()?;
 
     let factory_contract_code_id = ctx
-        .get_contract("astroport_whitelist")
-        .unwrap()
+        .get_contract()
+        .contract("astroport_whitelist")
+        .get_cw()
         .code_id
         .unwrap();
 
@@ -165,7 +192,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         .salt_hex_encoded(hex::encode("examplesalt").as_str())
         .get();
 
-    let mut cw = ctx.get_contract("astroport_whitelist").unwrap();
+    let mut cw = ctx.get_contract().contract("astroport_whitelist").get_cw();
     cw.contract_addr = Some(addr);
 
     cw.execute(

diff --git a/examples/neutron_osmosis.rs b/examples/neutron_osmosis.rs
@@ -32,7 +32,11 @@ fn main() -> Result<(), Box<dyn Error>> {
         .with_chain_name("neutron")
         .with_subdenom("bruhtoken")
         .send()?;
-    let bruhtoken = ctx.get_tokenfactory_denom(NEUTRON_ACC_0_ADDR, "bruhtoken");
+    let bruhtoken = ctx
+        .get_tokenfactory_denom()
+        .creator(NEUTRON_ACC_0_ADDR)
+        .subdenom("bruhtoken".into())
+        .get();
     ctx.build_tx_mint_tokenfactory_token()
         .with_chain_name("neutron")
         .with_amount(10000000000000000000)
@@ -53,8 +57,18 @@ fn main() -> Result<(), Box<dyn Error>> {
         .with_amount(1000000)
         .send()?;
 
-    let ibc_bruhtoken = ctx.get_ibc_denom(&bruhtoken, "neutron", "osmosis");
-    let ibc_neutron = ctx.get_ibc_denom("untrn", "neutron", "osmosis");
+    let ibc_bruhtoken = ctx
+        .get_ibc_denom()
+        .base_denom(bruhtoken.clone())
+        .src("neutron")
+        .dest("osmosis")
+        .get();
+    let ibc_neutron = ctx
+        .get_ibc_denom()
+        .base_denom("untrn".into())
+        .src("neutron")
+        .dest("osmosis")
+        .get();
 
     // Create an osmosis pool
     ctx.build_tx_create_osmo_pool()
@@ -65,7 +79,10 @@ fn main() -> Result<(), Box<dyn Error>> {
         .send()?;
 
     // Get its id
-    let pool_id = ctx.get_osmo_pool(&ibc_neutron, &ibc_bruhtoken)?;
+    let pool_id = ctx
+        .get_osmo_pool()
+        .denoms(ibc_neutron.clone(), ibc_bruhtoken.clone())
+        .get_u64();
 
     // Fund the pool
     ctx.build_tx_fund_osmo_pool()

diff --git a/examples/osmosis.rs b/examples/osmosis.rs
@@ -21,7 +21,11 @@ fn main() -> Result<(), Box<dyn Error>> {
         .with_chain_name(OSMOSIS_CHAIN_NAME)
         .with_subdenom("bruhtoken")
         .send()?;
-    let bruhtoken = ctx.get_tokenfactory_denom(ACC_0_ADDR, "bruhtoken");
+    let bruhtoken = ctx
+        .get_tokenfactory_denom()
+        .creator(ACC_0_ADDR)
+        .subdenom("bruhtoken".into())
+        .get();
     ctx.build_tx_mint_tokenfactory_token()
         .with_chain_name(OSMOSIS_CHAIN_NAME)
         .with_amount(10000000000000000000)
@@ -38,7 +42,10 @@ fn main() -> Result<(), Box<dyn Error>> {
         .send()?;
 
     // Get its id
-    let pool_id = ctx.get_osmo_pool("uosmo", &bruhtoken)?;
+    let pool_id = ctx
+        .get_osmo_pool()
+        .denoms("uosmo".into(), bruhtoken.clone())
+        .get_u64();
 
     // Fund the pool
     ctx.build_tx_fund_osmo_pool()