Start removing custom protobuf code

Author: ethanfrey

packages/multi-test/src/executor.rs

@@ -1,10 +1,10 @@
 use std::fmt;
 
-use crate::parse_contract_addr;
 use cosmwasm_std::{
     to_binary, Addr, Attribute, BankMsg, Binary, Coin, CosmosMsg, Event, SubMsgExecutionResponse,
     WasmMsg,
 };
+use cw0::parse_instantiate_response_data;
 use schemars::JsonSchema;
 use serde::Serialize;
 
@@ -91,7 +91,8 @@ where
             label: label.into(),
         };
         let res = self.execute(sender, msg.into())?;
-        parse_contract_addr(&res.data)
+        let data = parse_instantiate_response_data(res.data.unwrap_or_default().as_slice())?;
+        Ok(Addr::unchecked(data.contract_address))
     }
 
     /// Execute a contract and process all returned messages.

packages/multi-test/src/lib.rs

@@ -28,4 +28,4 @@ pub use crate::contracts::{Contract, ContractWrapper};
 pub use crate::executor::{AppResponse, Executor};
 pub use crate::module::Module;
 pub use crate::staking::{FailingDistribution, FailingStaking, Staking, StakingSudo};
-pub use crate::wasm::{parse_contract_addr, Wasm, WasmKeeper, WasmSudo};
+pub use crate::wasm::{Wasm, WasmKeeper, WasmSudo};

packages/multi-test/src/wasm.rs

@@ -23,8 +23,7 @@ use crate::executor::AppResponse;
 use crate::transactions::transactional;
 use cosmwasm_std::testing::mock_wasmd_attr;
 
-use anyhow::{anyhow, bail, Result as AnyResult};
-use cw0::parse_instantiate_response_data;
+use anyhow::{bail, Result as AnyResult};
 
 // Contract state is kept in Storage, separate from the contracts themselves
 const CONTRACTS: Map<&Addr, ContractData> = Map::new("contracts");
@@ -836,6 +835,8 @@ where
     }
 }
 
+// TODO: replace with code in cw0
+
 #[derive(Clone, PartialEq, Message)]
 pub struct InstantiateData {
     #[prost(string, tag = "1")]
@@ -857,20 +858,6 @@ fn init_response(res: &mut AppResponse, contact_address: &Addr) {
     res.data = Some(new_data.into());
 }
 
-// this parses the result from a wasm contract init
-pub fn parse_contract_addr(data: &Option<Binary>) -> AnyResult<Addr> {
-    let bin = data
-        .as_ref()
-        .ok_or_else(|| anyhow!("No data response"))?
-        .to_vec();
-    // parse the protobuf struct
-    let init_data = parse_instantiate_response_data(bin.as_slice())?;
-    if init_data.contract_address.is_empty() {
-        bail!("no contract address provided");
-    }
-    Ok(Addr::unchecked(init_data.contract_address))
-}
-
 #[cfg(test)]
 mod test {
     use cosmwasm_std::testing::{mock_env, mock_info, MockApi, MockQuerier, MockStorage};