avoid resumeTrade's dive through reconnect calls

decred · Dec 1, 2022 · 5d0c02a · 5d0c02a
1 parent a2455df
commit 5d0c02a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/client/core/core.go b/client/core/core.go
@@ -1760,7 +1760,7 @@ func (c *Core) connectAndUpdateWalletResumeTrades(w *xcWallet, resumeTrades bool
 
 	c.log.Infof("Connecting wallet for %s", unbip(assetID))
 	addr := w.currentDepositAddress()
-	newAddr, err := c.connectWalletResumeTrades(w, resumeTrades) // ==>
+	newAddr, err := c.connectWalletResumeTrades(w, resumeTrades)
 	if err != nil {
 		return fmt.Errorf("connectWallet: %w", err) // core.Error with code connectWalletErr
 	}
@@ -6648,7 +6648,7 @@ func (c *Core) resumeTrade(tracker *trackedTrade, crypter encrypt.Crypter, faile
 		return false
 	}
 
-	err := c.connectAndUnlockResumeTrades(crypter, tracker.wallets.baseWallet, false) // ==>
+	err := c.connectAndUnlockResumeTrades(crypter, tracker.wallets.baseWallet, false)
 	if err != nil {
 		failed[tracker.Base()] = true
 		return false
@@ -6682,7 +6682,7 @@ func (c *Core) resumeTrades(crypter encrypt.Crypter) {
 			}
 			tracker.mtx.RUnlock()
 
-			if c.resumeTrade(tracker, crypter, failed, relocks) { // ==>
+			if c.resumeTrade(tracker, crypter, failed, relocks) {
 				c.notify(newOrderNote(TopicOrderLoaded, "", "", db.Data, tracker.coreOrder()))
 			} else {
 				tracker.mtx.RLock()

diff --git a/client/core/core_test.go b/client/core/core_test.go
@@ -7285,8 +7285,9 @@ func TestReconfigureWallet(t *testing.T) {
 		matches: map[order.MatchID]*matchTracker{
 			{}: match,
 		},
-		metaData: &db.OrderMetaData{},
-		dc:       rig.dc,
+		metaData:    &db.OrderMetaData{},
+		dc:          rig.dc,
+		readyToTick: true, // prevent resume path
 	}
 	tCore.conns[tDexHost].tradeMtx.Unlock()