Merge pull request #1941 from CosmWasm/1792-avoid-hashmap

Use IntoIterator for DistributionQuerier::new parameter

Author: chipshort

CHANGELOG.md

@@ -44,6 +44,8 @@ and this project adheres to
   `ValidatorResponse` and `Validator` non-exhaustive. Add `Validator::create`
   and `FullDelegation::create` to allow creating them in a stable way. Use
   `Addr` type for `ContractInfoResponse::{creator, admin}`. ([#1883])
+- cosmwasm-std: Change `DistributionQuerier::new` to take `IntoIterator` instead
+  of `HashMap`. ([#1941])
 
 [#1874]: https://github.com/CosmWasm/cosmwasm/pull/1874
 [#1876]: https://github.com/CosmWasm/cosmwasm/pull/1876
@@ -54,6 +56,7 @@ and this project adheres to
 [#1902]: https://github.com/CosmWasm/cosmwasm/pull/1902
 [#1939]: https://github.com/CosmWasm/cosmwasm/pull/1939
 [#1940]: https://github.com/CosmWasm/cosmwasm/pull/1940
+[#1941]: https://github.com/CosmWasm/cosmwasm/pull/1941
 
 ### Removed
 

packages/std/src/testing/mock.rs

@@ -1,5 +1,6 @@
 use alloc::collections::BTreeMap;
 use bech32::{encode, ToBase32, Variant};
+use core::iter::IntoIterator;
 use core::marker::PhantomData;
 #[cfg(feature = "cosmwasm_1_3")]
 use core::ops::Bound;
@@ -989,7 +990,7 @@ impl StakingQuerier {
 #[cfg(feature = "cosmwasm_1_3")]
 #[derive(Clone, Default)]
 pub struct DistributionQuerier {
-    withdraw_addresses: HashMap<String, String>,
+    withdraw_addresses: BTreeMap<String, String>,
     /// Mock of accumulated rewards, indexed first by delegator and then validator address.
     rewards: BTreeMap<String, BTreeMap<String, Vec<DecCoin>>>,
     /// Mock of validators that a delegator has bonded to.
@@ -998,9 +999,12 @@ pub struct DistributionQuerier {
 
 #[cfg(feature = "cosmwasm_1_3")]
 impl DistributionQuerier {
-    pub fn new(withdraw_addresses: HashMap<String, String>) -> Self {
+    pub fn new<T>(withdraw_addresses: T) -> Self
+    where
+        T: IntoIterator<Item = (String, String)>,
+    {
         DistributionQuerier {
-            withdraw_addresses,
+            withdraw_addresses: withdraw_addresses.into_iter().collect(),
             ..Default::default()
         }
     }
@@ -2359,4 +2363,27 @@ mod tests {
     fn making_an_address_with_empty_prefix_should_panic() {
         MockApi::default().with_prefix("").addr_make("creator");
     }
+
+    #[test]
+    #[cfg(feature = "cosmwasm_1_3")]
+    fn distribution_querier_new_works() {
+        let addresses = [
+            ("addr0000".to_string(), "addr0001".to_string()),
+            ("addr0002".to_string(), "addr0001".to_string()),
+        ];
+        let btree_map = BTreeMap::from(addresses.clone());
+
+        // should still work with HashMap
+        let hashmap = HashMap::from(addresses.clone());
+        let querier = DistributionQuerier::new(hashmap);
+        assert_eq!(querier.withdraw_addresses, btree_map);
+
+        // should work with BTreeMap
+        let querier = DistributionQuerier::new(btree_map.clone());
+        assert_eq!(querier.withdraw_addresses, btree_map);
+
+        // should work with array
+        let querier = DistributionQuerier::new(addresses);
+        assert_eq!(querier.withdraw_addresses, btree_map);
+    }
 }