Merge pull request #2409 from CosmWasm/rm-mock_info

Remove mock_info

Author: webmaster128

CHANGELOG.md

@@ -55,6 +55,8 @@ and this project adheres to
   of `::new`. ([#2399])
 - cosmwasm-std: Move `MemoryStorage` to `cosmwasm_std::testing::MockStorage`.
   ([#2237])
+- cosmwasm-std: Remove previously deprecated `cosmwast_std::testing::mock_info`.
+  Use `cosmwasm_std::testing::message_info` instead. ([#2393])
 
 ## Fixed
 
@@ -78,6 +80,7 @@ and this project adheres to
 [#2378]: https://github.com/CosmWasm/cosmwasm/issues/2378
 [#2383]: https://github.com/CosmWasm/cosmwasm/issues/2383
 [#2390]: https://github.com/CosmWasm/cosmwasm/issues/2390
+[#2393]: https://github.com/CosmWasm/cosmwasm/issues/2393
 [#2399]: https://github.com/CosmWasm/cosmwasm/pull/2399
 [#2403]: https://github.com/CosmWasm/cosmwasm/pull/2403
 

packages/std/src/coin.rs

@@ -84,8 +84,6 @@ pub fn coins(amount: u128, denom: impl Into<String>) -> Vec<Coin> {
 ///
 /// ```
 /// # use cosmwasm_std::{coin, BankMsg, CosmosMsg, Response, SubMsg};
-/// # use cosmwasm_std::testing::{mock_env, mock_info};
-/// # let env = mock_env();
 /// # let recipient = "blub".to_string();
 /// let tip = vec![
 ///     coin(123, "ucosm"),

packages/std/src/testing/mock.rs

@@ -39,7 +39,7 @@ use crate::query::{
 use crate::query::{DelegatorWithdrawAddressResponse, DistributionQuery};
 use crate::results::{ContractResult, Empty, SystemResult};
 use crate::traits::{Api, Querier, QuerierResult};
-use crate::types::{BlockInfo, ContractInfo, Env, MessageInfo, TransactionInfo};
+use crate::types::{BlockInfo, ContractInfo, Env, TransactionInfo};
 use crate::{from_json, to_json_binary, Binary, Uint128};
 #[cfg(feature = "cosmwasm_1_3")]
 use crate::{
@@ -406,16 +406,6 @@ pub fn mock_env() -> Env {
     }
 }
 
-/// Just set sender and funds for the message.
-/// This is intended for use in test code only.
-#[deprecated(note = "This is inconvenient and unsafe. Use message_info instead.")]
-pub fn mock_info(sender: &str, funds: &[Coin]) -> MessageInfo {
-    MessageInfo {
-        sender: Addr::unchecked(sender),
-        funds: funds.to_vec(),
-    }
-}
-
 /// Creates an IbcChannel for testing. You set a few key parameters for handshaking,
 /// If you want to set more, use this as a default and mutate other fields
 #[cfg(feature = "stargate")]
@@ -1239,9 +1229,11 @@ pub fn mock_wasmd_attr(key: impl Into<String>, value: impl Into<String>) -> Attr
 #[cfg(test)]
 mod tests {
     use super::*;
+    #[allow(unused)]
+    use crate::coins;
     #[cfg(feature = "cosmwasm_1_3")]
     use crate::DenomUnit;
-    use crate::{coin, coins, instantiate2_address, ContractInfoResponse, HexBinary, Response};
+    use crate::{coin, instantiate2_address, ContractInfoResponse, HexBinary, Response};
     #[cfg(feature = "staking")]
     use crate::{Decimal, Delegation};
     use base64::{engine::general_purpose, Engine};
@@ -1280,22 +1272,6 @@ mod tests {
         assert_eq!(contract_address, Addr::unchecked(MOCK_CONTRACT_ADDR));
     }
 
-    #[test]
-    fn mock_info_works() {
-        #[allow(deprecated)]
-        let info = mock_info("my name", &coins(100, "atom"));
-        assert_eq!(
-            info,
-            MessageInfo {
-                sender: Addr::unchecked("my name"),
-                funds: vec![Coin {
-                    amount: 100u128.into(),
-                    denom: "atom".into(),
-                }]
-            }
-        );
-    }
-
     #[test]
     fn addr_validate_works() {
         // default prefix is 'cosmwasm'

packages/std/src/testing/mod.rs

@@ -15,8 +15,6 @@ pub use assertions::assert_hash_works_impl;
 pub use message_info::message_info;
 #[cfg(feature = "ibc2")]
 pub use mock::mock_ibc2_packet_recv;
-#[allow(deprecated)]
-pub use mock::mock_info;
 #[cfg(feature = "cosmwasm_1_3")]
 pub use mock::DistributionQuerier;
 #[cfg(feature = "staking")]