Merge pull request #241 from hadronlabs-org/fix/integration-tests

Fix integration tests

Author: ratik

contracts/factory/src/contract.rs

@@ -529,6 +529,7 @@ pub fn validate_contract_metadata(
     let contract_config_owner = get_contract_config_owner(deps, contract_addr)?;
     if contract_config_owner != env.contract.address {
         return Err(ContractError::InvalidContractOwner {
+            contract: contract_addr.to_string(),
             expected: env.contract.address.to_string(),
             actual: contract_config_owner,
         });
@@ -539,12 +540,14 @@ pub fn validate_contract_metadata(
     if let Some(contract_admin) = contract_info.admin {
         if contract_admin != env.contract.address {
             return Err(ContractError::InvalidContractAdmin {
+                contract: contract_addr.to_string(),
                 expected: env.contract.address.to_string(),
                 actual: contract_admin.to_string(),
             });
         }
     } else {
         return Err(ContractError::InvalidContractAdmin {
+            contract: contract_addr.to_string(),
             expected: env.contract.address.to_string(),
             actual: "None".to_string(),
         });

contracts/factory/src/tests.rs

@@ -1160,6 +1160,7 @@ fn test_validate_contract_metadata_wrong_owner() {
     assert_eq!(
         error,
         drop_staking_base::error::factory::ContractError::InvalidContractOwner {
+            contract: String::from(contract_addr),
             expected: "cosmos2contract".to_string(),
             actual: "wrong_owner_address".to_string()
         }
@@ -1191,6 +1192,7 @@ fn test_validate_contract_metadata_wrong_admin() {
     assert_eq!(
         error,
         drop_staking_base::error::factory::ContractError::InvalidContractAdmin {
+            contract: String::from(contract_addr),
             expected: "cosmos2contract".to_string(),
             actual: "wrong_contract_admin".to_string()
         }
@@ -1222,6 +1224,7 @@ fn test_validate_contract_metadata_empty_admin() {
     assert_eq!(
         error,
         drop_staking_base::error::factory::ContractError::InvalidContractAdmin {
+            contract: String::from(contract_addr),
             expected: "cosmos2contract".to_string(),
             actual: "None".to_string()
         }