Remove canonical_length parameter

Author: webmaster128

contracts/burner/src/contract.rs

@@ -75,7 +75,7 @@ mod tests {
 
     #[test]
     fn init_fails() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
 
         let msg = InitMsg {};
         let env = mock_env("creator", &coins(1000, "earth"));
@@ -91,7 +91,7 @@ mod tests {
 
     #[test]
     fn migrate_cleans_up_data() {
-        let mut deps = mock_dependencies(20, &coins(123456, "gold"));
+        let mut deps = mock_dependencies(&coins(123456, "gold"));
 
         // store some sample data
         deps.storage.set(b"foo", b"bar");

contracts/hackatom/src/contract.rs

@@ -373,7 +373,7 @@ mod tests {
 
     #[test]
     fn proper_initialization() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
 
         let verifier = HumanAddr(String::from("verifies"));
         let beneficiary = HumanAddr(String::from("benefits"));
@@ -403,7 +403,7 @@ mod tests {
 
     #[test]
     fn init_and_query() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
 
         let verifier = HumanAddr(String::from("verifies"));
         let beneficiary = HumanAddr(String::from("benefits"));
@@ -423,7 +423,7 @@ mod tests {
 
     #[test]
     fn migrate_verifier() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
 
         let verifier = HumanAddr::from("verifies");
         let beneficiary = HumanAddr::from("benefits");
@@ -458,7 +458,7 @@ mod tests {
     fn querier_callbacks_work() {
         let rich_addr = HumanAddr::from("foobar");
         let rich_balance = coins(10000, "gold");
-        let deps = mock_dependencies_with_balances(20, &[(&rich_addr, &rich_balance)]);
+        let deps = mock_dependencies_with_balances(&[(&rich_addr, &rich_balance)]);
 
         // querying with balance gets the balance
         let bal = query_other_balance(&deps, rich_addr).unwrap();
@@ -471,7 +471,7 @@ mod tests {
 
     #[test]
     fn handle_release_works() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
 
         // initialize the store
         let creator = HumanAddr::from("creator");
@@ -514,7 +514,7 @@ mod tests {
 
     #[test]
     fn handle_release_fails_for_wrong_sender() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
 
         // initialize the store
         let creator = HumanAddr::from("creator");
@@ -558,7 +558,7 @@ mod tests {
     #[test]
     #[should_panic(expected = "This page intentionally faulted")]
     fn handle_panic() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
 
         // initialize the store
         let verifier = HumanAddr(String::from("verifies"));
@@ -580,7 +580,7 @@ mod tests {
 
     #[test]
     fn handle_user_errors_in_api_calls() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
 
         let init_msg = InitMsg {
             verifier: HumanAddr::from("verifies"),
@@ -599,7 +599,7 @@ mod tests {
         // the test framework doesn't handle contracts querying contracts yet,
         // let's just make sure the last step looks right
 
-        let deps = mock_dependencies(20, &[]);
+        let deps = mock_dependencies(&[]);
         let contract = HumanAddr::from("my-contract");
         let bin_contract: &[u8] = b"my-contract";
 

contracts/queue/src/contract.rs

@@ -207,7 +207,7 @@ mod tests {
     use cosmwasm_std::{coins, from_binary};
 
     fn create_contract() -> (Extern<MockStorage, MockApi, MockQuerier>, Env) {
-        let mut deps = mock_dependencies(20, &coins(1000, "earth"));
+        let mut deps = mock_dependencies(&coins(1000, "earth"));
         let env = mock_env("creator", &coins(1000, "earth"));
         let res = init(&mut deps, env.clone(), InitMsg {}).unwrap();
         assert_eq!(0, res.messages.len());

contracts/reflect/src/contract.rs

@@ -144,7 +144,7 @@ mod tests {
 
     #[test]
     fn proper_initialization() {
-        let mut deps = mock_dependencies_with_custom_querier(20, &[]);
+        let mut deps = mock_dependencies_with_custom_querier(&[]);
 
         let msg = InitMsg {};
         let env = mock_env("creator", &coins(1000, "earth"));
@@ -160,7 +160,7 @@ mod tests {
 
     #[test]
     fn reflect() {
-        let mut deps = mock_dependencies_with_custom_querier(20, &[]);
+        let mut deps = mock_dependencies_with_custom_querier(&[]);
 
         let msg = InitMsg {};
         let env = mock_env("creator", &coins(2, "token"));
@@ -183,7 +183,7 @@ mod tests {
 
     #[test]
     fn reflect_requires_owner() {
-        let mut deps = mock_dependencies_with_custom_querier(20, &[]);
+        let mut deps = mock_dependencies_with_custom_querier(&[]);
 
         let msg = InitMsg {};
         let env = mock_env("creator", &coins(2, "token"));
@@ -210,7 +210,7 @@ mod tests {
 
     #[test]
     fn reflect_reject_empty_msgs() {
-        let mut deps = mock_dependencies_with_custom_querier(20, &[]);
+        let mut deps = mock_dependencies_with_custom_querier(&[]);
 
         let msg = InitMsg {};
         let env = mock_env("creator", &coins(2, "token"));
@@ -231,7 +231,7 @@ mod tests {
 
     #[test]
     fn reflect_multiple_messages() {
-        let mut deps = mock_dependencies_with_custom_querier(20, &[]);
+        let mut deps = mock_dependencies_with_custom_querier(&[]);
 
         let msg = InitMsg {};
         let env = mock_env("creator", &coins(2, "token"));
@@ -264,7 +264,7 @@ mod tests {
 
     #[test]
     fn change_owner_works() {
-        let mut deps = mock_dependencies_with_custom_querier(20, &[]);
+        let mut deps = mock_dependencies_with_custom_querier(&[]);
 
         let msg = InitMsg {};
         let env = mock_env("creator", &coins(2, "token"));
@@ -285,13 +285,15 @@ mod tests {
 
     #[test]
     fn change_owner_requires_current_owner_as_sender() {
-        let mut deps = mock_dependencies_with_custom_querier(20, &[]);
+        let mut deps = mock_dependencies_with_custom_querier(&[]);
 
         let msg = InitMsg {};
-        let env = mock_env("creator", &coins(2, "token"));
+        let creator = HumanAddr::from("creator");
+        let env = mock_env(creator.clone(), &coins(2, "token"));
         let _res = init(&mut deps, env, msg).unwrap();
 
-        let env = mock_env("random", &[]);
+        let random = HumanAddr::from("random");
+        let env = mock_env(random.clone(), &[]);
         let new_owner = HumanAddr::from("friend");
         let msg = HandleMsg::ChangeOwner {
             owner: new_owner.clone(),
@@ -300,16 +302,16 @@ mod tests {
         let res = handle(&mut deps, env, msg);
         match res.unwrap_err() {
             ReflectError::NotCurrentOwner { expected, actual } => {
-                assert_eq!(expected.as_slice(), b"creator\0\0\0\0\0\0\0\0\0\0\0\0\0");
-                assert_eq!(actual.as_slice(), b"random\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+                assert_eq!(expected, deps.api.canonical_address(&creator).unwrap());
+                assert_eq!(actual, deps.api.canonical_address(&random).unwrap());
             }
             err => panic!("Unexpected error: {:?}", err),
         }
     }
 
     #[test]
     fn change_owner_errors_for_invalid_new_address() {
-        let mut deps = mock_dependencies_with_custom_querier(20, &[]);
+        let mut deps = mock_dependencies_with_custom_querier(&[]);
         let creator = HumanAddr::from("creator");
 
         let msg = InitMsg {};
@@ -331,7 +333,7 @@ mod tests {
 
     #[test]
     fn capitalized_query_works() {
-        let deps = mock_dependencies_with_custom_querier(20, &[]);
+        let deps = mock_dependencies_with_custom_querier(&[]);
 
         let msg = QueryMsg::Capitalized {
             text: "demo one".to_string(),
@@ -343,7 +345,7 @@ mod tests {
 
     #[test]
     fn chain_query_works() {
-        let deps = mock_dependencies_with_custom_querier(20, &coins(123, "ucosm"));
+        let deps = mock_dependencies_with_custom_querier(&coins(123, "ucosm"));
 
         // with bank query
         let msg = QueryMsg::Chain {

contracts/reflect/src/testing.rs

@@ -6,7 +6,6 @@ use cosmwasm_std::{to_binary, Binary, Coin, ContractResult, Extern, HumanAddr, S
 /// A drop-in replacement for cosmwasm_std::testing::mock_dependencies
 /// this uses our CustomQuerier.
 pub fn mock_dependencies_with_custom_querier(
-    canonical_length: usize,
     contract_balance: &[Coin],
 ) -> Extern<MockStorage, MockApi, MockQuerier<SpecialQuery>> {
     let contract_addr = HumanAddr::from(MOCK_CONTRACT_ADDR);
@@ -15,7 +14,7 @@ pub fn mock_dependencies_with_custom_querier(
             .with_custom_handler(|query| SystemResult::Ok(custom_query_execute(&query)));
     Extern {
         storage: MockStorage::default(),
-        api: MockApi::new(canonical_length),
+        api: MockApi::default(),
         querier: custom_querier,
     }
 }
@@ -52,7 +51,7 @@ mod test {
 
     #[test]
     fn custom_querier() {
-        let deps = mock_dependencies_with_custom_querier(20, &[]);
+        let deps = mock_dependencies_with_custom_querier(&[]);
         let req: QueryRequest<_> = SpecialQuery::Capitalized {
             text: "food".to_string(),
         }

contracts/reflect/tests/integration.rs

@@ -42,7 +42,6 @@ static WASM: &[u8] = include_bytes!("../target/wasm32-unknown-unknown/release/re
 /// A drop-in replacement for cosmwasm_vm::testing::mock_dependencies
 /// that supports SpecialQuery.
 pub fn mock_dependencies_with_custom_querier(
-    canonical_length: usize,
     contract_balance: &[Coin],
 ) -> Extern<MockStorage, MockApi, MockQuerier<SpecialQuery>> {
     let contract_addr = HumanAddr::from(MOCK_CONTRACT_ADDR);
@@ -52,7 +51,7 @@ pub fn mock_dependencies_with_custom_querier(
 
     Extern {
         storage: MockStorage::default(),
-        api: MockApi::new(canonical_length),
+        api: MockApi::default(),
         querier: custom_querier,
     }
 }
@@ -177,7 +176,7 @@ fn transfer_requires_owner() {
 #[test]
 fn dispatch_custom_query() {
     // stub gives us defaults. Consume it and override...
-    let custom = mock_dependencies_with_custom_querier(20, &[]);
+    let custom = mock_dependencies_with_custom_querier(&[]);
     // we cannot use mock_instance, so we just copy and modify code from cosmwasm_vm::testing
     let mut deps = Instance::from_code(WASM, custom, 500_000, false).unwrap();
 

contracts/staking/src/contract.rs

@@ -509,7 +509,7 @@ mod tests {
 
     #[test]
     fn initialization_with_missing_validator() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
         deps.querier
             .update_staking("ustake", &[sample_validator("john")], &[]);
 
@@ -536,7 +536,7 @@ mod tests {
 
     #[test]
     fn proper_initialization() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
         deps.querier.update_staking(
             "ustake",
             &[
@@ -587,7 +587,7 @@ mod tests {
 
     #[test]
     fn bonding_issues_tokens() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
         set_validator(&mut deps.querier);
 
         let creator = HumanAddr::from("creator");
@@ -627,7 +627,7 @@ mod tests {
 
     #[test]
     fn rebonding_changes_pricing() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
         set_validator(&mut deps.querier);
 
         let creator = HumanAddr::from("creator");
@@ -687,7 +687,7 @@ mod tests {
 
     #[test]
     fn bonding_fails_with_wrong_denom() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
         set_validator(&mut deps.querier);
 
         let creator = HumanAddr::from("creator");
@@ -715,7 +715,7 @@ mod tests {
 
     #[test]
     fn unbonding_maintains_price_ratio() {
-        let mut deps = mock_dependencies(20, &[]);
+        let mut deps = mock_dependencies(&[]);
         set_validator(&mut deps.querier);
 
         let creator = HumanAddr::from("creator");