Pass api to make_init_msg

Author: chipshort

contracts/hackatom/tests/integration.rs

@@ -27,7 +27,7 @@ use cosmwasm_vm::{
         execute, instantiate, migrate, mock_env, mock_info, mock_instance,
         mock_instance_with_balances, query, sudo, test_io, MockApi, MOCK_CONTRACT_ADDR,
     },
-    Instance, Querier, Storage, VmError,
+    Storage, VmError,
 };
 
 use hackatom::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, SudoMsg};
@@ -37,12 +37,10 @@ static WASM: &[u8] = include_bytes!("../target/wasm32-unknown-unknown/release/ha
 
 const DESERIALIZATION_LIMIT: usize = 20_000;
 
-fn make_init_msg<S: Storage + 'static, Q: Querier + 'static>(
-    deps: &Instance<MockApi, S, Q>,
-) -> (InstantiateMsg, String) {
-    let verifier = deps.api().addr_make("verifies");
-    let beneficiary = deps.api().addr_make("benefits");
-    let creator = deps.api().addr_make("creator");
+fn make_init_msg(api: &MockApi) -> (InstantiateMsg, String) {
+    let verifier = api.addr_make("verifies");
+    let beneficiary = api.addr_make("benefits");
+    let creator = api.addr_make("creator");
     (
         InstantiateMsg {
             verifier,
@@ -319,7 +317,7 @@ fn execute_release_fails_for_wrong_sender() {
 fn execute_cpu_loop() {
     let mut deps = mock_instance(WASM, &[]);
 
-    let (instantiate_msg, creator) = make_init_msg(&deps);
+    let (instantiate_msg, creator) = make_init_msg(deps.api());
     let init_info = mock_info(creator.as_str(), &[]);
     let init_res: Response =
         instantiate(&mut deps, mock_env(), init_info, instantiate_msg).unwrap();
@@ -341,7 +339,7 @@ fn execute_cpu_loop() {
 fn execute_storage_loop() {
     let mut deps = mock_instance(WASM, &[]);
 
-    let (instantiate_msg, creator) = make_init_msg(&deps);
+    let (instantiate_msg, creator) = make_init_msg(deps.api());
     let init_info = mock_info(creator.as_str(), &[]);
     let init_res: Response =
         instantiate(&mut deps, mock_env(), init_info, instantiate_msg).unwrap();
@@ -363,7 +361,7 @@ fn execute_storage_loop() {
 fn execute_memory_loop() {
     let mut deps = mock_instance(WASM, &[]);
 
-    let (instantiate_msg, creator) = make_init_msg(&deps);
+    let (instantiate_msg, creator) = make_init_msg(deps.api());
     let init_info = mock_info(creator.as_str(), &[]);
     let init_res: Response =
         instantiate(&mut deps, mock_env(), init_info, instantiate_msg).unwrap();
@@ -388,7 +386,7 @@ fn execute_memory_loop() {
 fn execute_allocate_large_memory() {
     let mut deps = mock_instance(WASM, &[]);
 
-    let (instantiate_msg, creator) = make_init_msg(&deps);
+    let (instantiate_msg, creator) = make_init_msg(deps.api());
     let init_info = mock_info(creator.as_str(), &[]);
     let init_res: Response =
         instantiate(&mut deps, mock_env(), init_info, instantiate_msg).unwrap();
@@ -444,7 +442,7 @@ fn execute_allocate_large_memory() {
 fn execute_panic() {
     let mut deps = mock_instance(WASM, &[]);
 
-    let (instantiate_msg, creator) = make_init_msg(&deps);
+    let (instantiate_msg, creator) = make_init_msg(deps.api());
     let init_info = mock_info(creator.as_str(), &[]);
     let init_res: Response =
         instantiate(&mut deps, mock_env(), init_info, instantiate_msg).unwrap();
@@ -475,7 +473,7 @@ fn execute_panic() {
 fn execute_user_errors_in_api_calls() {
     let mut deps = mock_instance(WASM, &[]);
 
-    let (instantiate_msg, creator) = make_init_msg(&deps);
+    let (instantiate_msg, creator) = make_init_msg(deps.api());
     let init_info = mock_info(creator.as_str(), &[]);
     let _init_res: Response =
         instantiate(&mut deps, mock_env(), init_info, instantiate_msg).unwrap();