diff --git a/common/cosmwasm-smart-contracts/testing/src/lib.rs b/common/cosmwasm-smart-contracts/testing/src/lib.rs index 336c3544c2..2f972f74cb 100644 --- a/common/cosmwasm-smart-contracts/testing/src/lib.rs +++ b/common/cosmwasm-smart-contracts/testing/src/lib.rs @@ -12,7 +12,7 @@ pub use error::MockingError; pub use execution::{ CrossContractTokenMove, ExecutionResult, ExecutionStepResult, FurtherExecution, }; -pub use multi_contract_mock::{DuplicateContractAddress, MultiContractMock, TestableContract}; +pub use multi_contract_mock::{MultiContractMock, TestableContract}; pub use raw_state::ContractState; pub const AVERAGE_BLOCKTIME_SECS: u64 = 5; diff --git a/common/cosmwasm-smart-contracts/testing/src/multi_contract_mock.rs b/common/cosmwasm-smart-contracts/testing/src/multi_contract_mock.rs index 03fdbcacc5..d38e1baa19 100644 --- a/common/cosmwasm-smart-contracts/testing/src/multi_contract_mock.rs +++ b/common/cosmwasm-smart-contracts/testing/src/multi_contract_mock.rs @@ -14,14 +14,6 @@ use cosmwasm_std::{ use serde::de::DeserializeOwned; use serde::Serialize; use std::collections::HashMap; -use std::fmt::Debug; -use thiserror::Error; - -#[derive(Debug, Error)] -#[error("attempted to add another contract mock that has the same address as an existing one - {address}")] -pub struct DuplicateContractAddress { - address: Addr, -} // TODO: see if it's possible to create a macro to auto-derive it // if you intend to use the MultiContractMock, you need to implement this trait @@ -131,13 +123,13 @@ impl MultiContractMock { pub fn add_contract( &mut self, contract_state: ContractMock, - ) -> Result<(), DuplicateContractAddress> { + ) -> Result<(), MockingError> { let address = contract_state.contract_address().clone(); if self .contracts .contains_key(contract_state.contract_address()) { - Err(DuplicateContractAddress { address }) + Err(MockingError::DuplicateContractAddress { address }) } else { let mocked = MockedContract::new::(contract_state); self.contracts.insert(address, mocked); @@ -148,7 +140,7 @@ impl MultiContractMock { pub fn with_contract( mut self, state: ContractMock, - ) -> Result { + ) -> Result { self.add_contract::(state)?; Ok(self) }