wallet: remove required resolver for RgbWallet construction

RGB-WG · Aug 1, 2023 · a17c0b1 · a17c0b1
1 parent 0c22d86
commit a17c0b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/runtime.rs b/src/runtime.rs
@@ -183,7 +183,9 @@ impl Runtime {
             .wallets
             .get(name)
             .ok_or(RuntimeError::WalletUnknown(name.clone()))?;
-        RgbWallet::with(descr.clone(), &mut self.resolver).map_err(RuntimeError::from)
+        let mut wallet = RgbWallet::new(descr.clone());
+        wallet.update(&mut self.resolver)?;
+        Ok(wallet)
     }
 
     pub fn import_contract(

diff --git a/src/wallet.rs b/src/wallet.rs
@@ -59,26 +59,31 @@ pub struct RgbWallet {
 }
 
 impl RgbWallet {
-    pub fn with(descr: RgbDescr, resolver: &mut impl Resolver) -> Result<Self, String> {
-        let mut utxos = BTreeSet::new();
+    pub fn new(descr: RgbDescr) -> Self {
+        Self {
+            descr,
+            utxos: empty!(),
+        }
+    }
 
+    pub fn update(&mut self, resolver: &mut impl Resolver) -> Result<(), String> {
         const STEP: u32 = 20;
         for app in [0, 1, 9, 10] {
             let mut index = 0;
             loop {
                 debug!("Requesting {STEP} scripts from the Electrum server");
-                let scripts = descr.derive(app, index..(index + STEP));
+                let scripts = self.descr.derive(app, index..(index + STEP));
                 let set = resolver.resolve_utxo(scripts)?;
                 if set.is_empty() {
                     break;
                 }
                 debug!("Electrum server returned {} UTXOs", set.len());
-                utxos.extend(set);
+                self.utxos.extend(set);
                 index += STEP;
             }
         }
 
-        Ok(Self { descr, utxos })
+        Ok(())
     }
 
     pub fn utxo(&self, outpoint: Outpoint) -> Option<&Utxo> {