Merge pull request #733 from CosmWasm/remove-deprecated-results

Remove InitResult/HandleResult/MigrateResult/QueryResult

Author: webmaster128

CHANGELOG.md

@@ -19,6 +19,9 @@ and this project adheres to
 - cosmwasm-std: Remove `from_address` from `BankMsg::Send`, as it always sends
   from the contract address, and this is consistent with other `CosmosMsg`
   variants.
+- cosmwasm-std: Remove the previously deprecated `InitResult`, `HandleResult`,
+  `MigrateResult` and `QueryResult` in order to make error type explicit and
+  encourage migration to custom errors.
 - cosmwasm-vm: Avoid serialization of Modules in `InMemoryCache`, for
   performance. Also, remove `memory_limit` from `InstanceOptions`, and define it
   instead at `Cache` level (same memory limit for all cached instances).
@@ -80,7 +83,7 @@ and this project adheres to
 **cosmwasm-std**
 
 - Deprecate `InitResult`, `HandleResult`, `MigrateResult` and `QueryResult` in
-  order to make error type explicit an encourage migration to custom errors.
+  order to make error type explicit and encourage migration to custom errors.
 - Implement `Deref` for `QuerierWrapper`, such that `QuerierWrapper` behaves
   like a smart pointer to `Querier` allowing you to access `Querier` methods
   directly.

packages/std/src/lib.rs

@@ -39,11 +39,10 @@ pub use crate::query::{
     CustomQuery, Delegation, FullDelegation, QueryRequest, StakingQuery, Validator,
     ValidatorsResponse, WasmQuery,
 };
-#[allow(deprecated)]
 pub use crate::results::{
     attr, wasm_execute, wasm_instantiate, Attribute, BankMsg, Context, ContractResult, CosmosMsg,
-    HandleResponse, HandleResult, InitResponse, InitResult, MigrateResponse, MigrateResult,
-    QueryResponse, QueryResult, StakingMsg, SystemResult, WasmMsg,
+    HandleResponse, InitResponse, MigrateResponse, QueryResponse, StakingMsg, SystemResult,
+    WasmMsg,
 };
 pub use crate::serde::{from_binary, from_slice, to_binary, to_vec};
 pub use crate::storage::MemoryStorage;

packages/std/src/results/handle.rs

@@ -3,7 +3,6 @@ use serde::{Deserialize, Serialize};
 use std::fmt;
 
 use crate::binary::Binary;
-use crate::errors::StdError;
 use crate::types::Empty;
 
 use super::attribute::Attribute;
@@ -32,10 +31,3 @@ where
         }
     }
 }
-
-#[deprecated(
-    since = "0.12.1",
-    note = "HandleResult is deprecated because it uses StdError, which should be replaced with custom errors in CosmWasm 0.11+. \
-            Replace this with Result<HandleResponse, StdError> or Result<HandleResponse<U>, StdError> and consider migrating to custom errors from there."
-)]
-pub type HandleResult<U = Empty> = Result<HandleResponse<U>, StdError>;

packages/std/src/results/init.rs

@@ -2,7 +2,6 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
-use crate::errors::StdError;
 use crate::types::Empty;
 
 use super::attribute::Attribute;
@@ -30,13 +29,6 @@ where
     }
 }
 
-#[deprecated(
-    since = "0.12.1",
-    note = "InitResult is deprecated because it uses StdError, which should be replaced with custom errors in CosmWasm 0.11+. \
-            Replace this with Result<InitResponse, StdError> or Result<InitResponse<U>, StdError> and consider migrating to custom errors from there."
-)]
-pub type InitResult<U = Empty> = Result<InitResponse<U>, StdError>;
-
 #[cfg(test)]
 mod tests {
     use super::super::BankMsg;

packages/std/src/results/migrate.rs

@@ -3,7 +3,6 @@ use serde::{Deserialize, Serialize};
 use std::fmt;
 
 use crate::binary::Binary;
-use crate::errors::StdError;
 use crate::types::Empty;
 
 use super::attribute::Attribute;
@@ -32,10 +31,3 @@ where
         }
     }
 }
-
-#[deprecated(
-    since = "0.12.1",
-    note = "MigrateResult is deprecated because it uses StdError, which should be replaced with custom errors in CosmWasm 0.11+. \
-            Replace this with Result<MigrateResponse, StdError> or Result<MigrateResponse<U>, StdError> and consider migrating to custom errors from there."
-)]
-pub type MigrateResult<U = Empty> = Result<MigrateResponse<U>, StdError>;

packages/std/src/results/mod.rs

@@ -14,12 +14,8 @@ pub use attribute::{attr, Attribute};
 pub use context::Context;
 pub use contract_result::ContractResult;
 pub use cosmos_msg::{wasm_execute, wasm_instantiate, BankMsg, CosmosMsg, StakingMsg, WasmMsg};
-#[allow(deprecated)]
-pub use handle::{HandleResponse, HandleResult};
-#[allow(deprecated)]
-pub use init::{InitResponse, InitResult};
-#[allow(deprecated)]
-pub use migrate::{MigrateResponse, MigrateResult};
-#[allow(deprecated)]
-pub use query::{QueryResponse, QueryResult};
+pub use handle::HandleResponse;
+pub use init::InitResponse;
+pub use migrate::MigrateResponse;
+pub use query::QueryResponse;
 pub use system_result::SystemResult;

packages/std/src/results/query.rs

@@ -1,11 +1,3 @@
 use crate::binary::Binary;
-use crate::errors::StdError;
 
 pub type QueryResponse = Binary;
-
-#[deprecated(
-    since = "0.12.1",
-    note = "QueryResult is deprecated because it uses StdError, which should be replaced with custom errors in CosmWasm 0.11+. \
-            Replace this with Result<QueryResponse, StdError> and consider migrating to custom errors from there."
-)]
-pub type QueryResult = Result<QueryResponse, StdError>;