core: elevate order fields to core

client/core/account.go

@@ -68,7 +68,7 @@ func (c *Core) ToggleAccountStatus(pw []byte, host string, disable bool) error {
 
 	if disable {
 		// Check active orders or bonds.
-		if dc.hasActiveOrders() {
+		if c.hasActiveOrders(host) {
 			return errors.New("cannot disable account with active orders")
 		}
 
@@ -364,7 +364,7 @@ func (c *Core) UpdateDEXHost(oldHost, newHost string, appPW []byte, certI any) (
 		return nil, err
 	}
 
-	if oldDc.hasActiveOrders() {
+	if c.hasActiveOrders(oldHost) {
 		return nil, fmt.Errorf("cannot update host while dex has active orders")
 	}
 

client/core/account_test.go

@@ -61,7 +61,7 @@ func TestAccountExport(t *testing.T) {
 
 func TestToggleAccountStatus(t *testing.T) {
 	activeTrades := map[order.OrderID]*trackedTrade{
-		{}: {metaData: &db.OrderMetaData{Status: order.OrderStatusBooked}},
+		{}: {metaData: &db.OrderMetaData{Status: order.OrderStatusBooked}, dc: &dexConnection{acct: &dexAccount{host: tDexHost}}},
 	}
 
 	tests := []struct {
@@ -124,7 +124,7 @@ func TestToggleAccountStatus(t *testing.T) {
 		rig.db.disabledHost = nil
 		rig.db.disableAccountErr = test.disableAcctErr
 		tCore.connMtx.Lock()
-		tCore.conns[tDexHost].trades = test.activeTrades
+		tCore.trades = test.activeTrades
 
 		if test.loseConns {
 			// Lose the dexConnection

client/core/bookie.go

@@ -739,8 +739,8 @@ func handleTradeSuspensionMsg(c *Core, dc *dexConnection, msg *msgjson.Message)
 	// Revoke all active orders of the suspended market for the dex.
 	c.log.Warnf("Revoking all active orders for market %s at %s.", sp.MarketID, dc.acct.host)
 	updatedAssets := make(assetMap)
-	dc.tradeMtx.RLock()
-	for _, tracker := range dc.trades {
+	c.tradeMtx.RLock()
+	for _, tracker := range c.trades {
 		if tracker.Order.Base() == mkt.Base && tracker.Order.Quote() == mkt.Quote &&
 			tracker.metaData.Host == dc.acct.host && tracker.status() == order.OrderStatusBooked {
 			// Locally revoke the purged book order.
@@ -750,7 +750,7 @@ func handleTradeSuspensionMsg(c *Core, dc *dexConnection, msg *msgjson.Message)
 			updatedAssets.count(tracker.fromAssetID)
 		}
 	}
-	dc.tradeMtx.RUnlock()
+	c.tradeMtx.RUnlock()
 
 	// Clear the book.
 	book.send(&BookUpdate{