contracts: move WalletState constructor to a dedicated method

Author: dr-orlovsky

src/contracts.rs

@@ -84,6 +84,32 @@ impl<Seal> Default for WalletState<Seal> {
     fn default() -> Self { Self { immutable: bmap! {}, owned: bmap! {}, aggregated: bmap! {} } }
 }
 
+impl<Seal> WalletState<Seal> {
+    pub fn from_contracts_state(
+        contracts: impl IntoIterator<Item = (ContractId, ContractState<Seal>)>,
+    ) -> Self {
+        let mut wallet_state = WalletState::default();
+        for (contract_id, contract_state) in contracts {
+            for (state_name, state) in contract_state.immutable {
+                wallet_state
+                    .immutable
+                    .insert(ContractStateName::new(contract_id, state_name), state);
+            }
+            for (state_name, state) in contract_state.owned {
+                wallet_state
+                    .owned
+                    .insert(ContractStateName::new(contract_id, state_name), state);
+            }
+            for (state_name, state) in contract_state.aggregated {
+                wallet_state
+                    .aggregated
+                    .insert(ContractStateName::new(contract_id, state_name), state);
+            }
+        }
+        wallet_state
+    }
+}
+
 /// Collection of RGB smart contracts and contract issuers, which can be cached in memory.
 ///
 /// # Generics

src/popls/bp.rs

@@ -55,9 +55,9 @@ use strict_types::StrictVal;
 
 use crate::contracts::SyncError;
 use crate::{
-    Assignment, CodexId, Consensus, ConsumeError, Contract, ContractState, ContractStateName,
-    Contracts, CreateParams, EitherSeal, Identity, Issuer, IssuerError, OwnedState, Pile, SigBlob,
-    Stockpile, WalletState, WitnessStatus,
+    Assignment, CodexId, Consensus, ConsumeError, Contract, ContractState, Contracts, CreateParams,
+    EitherSeal, Identity, Issuer, IssuerError, OwnedState, Pile, SigBlob, Stockpile, WalletState,
+    WitnessStatus,
 };
 
 /// Trait abstracting a specific implementation of a bitcoin wallet.
@@ -468,26 +468,11 @@ where
     }
 
     pub fn wallet_state(&self) -> WalletState<TxoSeal> {
-        let mut wallet_state = WalletState::default();
-        for contract_id in self.contracts.contract_ids() {
-            let contract_state = self.contracts.contract_state(contract_id);
-            for (state_name, state) in contract_state.immutable {
-                wallet_state
-                    .immutable
-                    .insert(ContractStateName::new(contract_id, state_name), state);
-            }
-            for (state_name, state) in contract_state.owned {
-                wallet_state
-                    .owned
-                    .insert(ContractStateName::new(contract_id, state_name), state);
-            }
-            for (state_name, state) in contract_state.aggregated {
-                wallet_state
-                    .aggregated
-                    .insert(ContractStateName::new(contract_id, state_name), state);
-            }
-        }
-        wallet_state
+        let iter = self
+            .contracts
+            .contract_ids()
+            .map(|id| (id, self.contracts.contract_state(id)));
+        WalletState::from_contracts_state(iter)
     }
 
     pub fn wallet_contract_state(&self, contract_id: ContractId) -> ContractState<Outpoint> {