les/lespay/server: use CapacityField only in balance tracker

Author: zsfelfoldi

les/clientpool.go

@@ -57,7 +57,7 @@ var (
 )
 
 func init() {
-	balanceTrackerSetup.Connect(connAddressField, priorityPoolSetup.CapacityField, priorityPoolSetup.ActiveFlag, priorityPoolSetup.InactiveFlag)
+	balanceTrackerSetup.Connect(connAddressField, priorityPoolSetup.CapacityField)
 	priorityPoolSetup.Connect(balanceTrackerSetup.BalanceField, balanceTrackerSetup.UpdateFlag) // NodeBalance implements nodePriority
 }
 

les/lespay/server/balance_test.go

@@ -37,7 +37,7 @@ var (
 )
 
 func init() {
-	btTestSetup.Connect(connAddrFlag, ppTestSetup.CapacityField, ppTestSetup.ActiveFlag, ppTestSetup.InactiveFlag)
+	btTestSetup.Connect(connAddrFlag, ppTestSetup.CapacityField)
 }
 
 type zeroExpirer struct{}
@@ -145,7 +145,7 @@ func TestBalanceTimeCost(t *testing.T) {
 	defer b.stop()
 	node := b.newNode(1000)
 
-	b.ns.SetState(node.node, ppTestSetup.ActiveFlag, nodestate.Flags{}, 0)
+	b.ns.SetField(node.node, ppTestSetup.CapacityField, uint64(1))
 	node.SetPriceFactors(PriceFactors{1, 0, 1}, PriceFactors{1, 0, 1})
 	node.SetBalance(uint64(time.Minute), 0) // 1 minute time allowance
 
@@ -187,7 +187,7 @@ func TestBalanceReqCost(t *testing.T) {
 	node := b.newNode(1000)
 	node.SetPriceFactors(PriceFactors{1, 0, 1}, PriceFactors{1, 0, 1})
 
-	b.ns.SetState(node.node, ppTestSetup.ActiveFlag, nodestate.Flags{}, 0)
+	b.ns.SetField(node.node, ppTestSetup.CapacityField, uint64(1))
 	node.SetBalance(uint64(time.Minute), 0) // 1 minute time serving time allowance
 	var inputs = []struct {
 		reqCost uint64
@@ -241,7 +241,7 @@ func TestEstimatedPriority(t *testing.T) {
 	node := b.newNode(1000000000)
 	node.SetPriceFactors(PriceFactors{1, 0, 1}, PriceFactors{1, 0, 1})
 
-	b.ns.SetState(node.node, ppTestSetup.ActiveFlag, nodestate.Flags{}, 0)
+	b.ns.SetField(node.node, ppTestSetup.CapacityField, uint64(1))
 	node.SetBalance(uint64(time.Minute), 0)
 	var inputs = []struct {
 		runTime    time.Duration // time cost
@@ -282,7 +282,7 @@ func TestPosBalanceMissing(t *testing.T) {
 	node := b.newNode(1000)
 	node.SetPriceFactors(PriceFactors{1, 0, 1}, PriceFactors{1, 0, 1})
 
-	b.ns.SetState(node.node, ppTestSetup.ActiveFlag, nodestate.Flags{}, 0)
+	b.ns.SetField(node.node, ppTestSetup.CapacityField, uint64(1))
 	var inputs = []struct {
 		pos, neg uint64
 		priority int64
@@ -330,15 +330,15 @@ func TestPostiveBalanceCounting(t *testing.T) {
 	// Change client status
 	for i := 0; i < 100; i += 1 {
 		if rand.Intn(2) == 0 {
-			b.ns.SetState(nodes[i].node, ppTestSetup.ActiveFlag, ppTestSetup.InactiveFlag, 0)
+			b.ns.SetField(nodes[i].node, ppTestSetup.CapacityField, uint64(1))
 		}
 	}
 	if b.bt.TotalTokenAmount() != sum {
 		t.Fatalf("Invalid token amount")
 	}
 	for i := 0; i < 100; i += 1 {
 		if rand.Intn(2) == 0 {
-			b.ns.SetState(nodes[i].node, ppTestSetup.InactiveFlag, ppTestSetup.ActiveFlag, 0)
+			b.ns.SetField(nodes[i].node, ppTestSetup.CapacityField, uint64(1))
 		}
 	}
 	if b.bt.TotalTokenAmount() != sum {
@@ -374,7 +374,7 @@ func TestCallback(t *testing.T) {
 	defer b.stop()
 	node := b.newNode(1000)
 	node.SetPriceFactors(PriceFactors{1, 0, 1}, PriceFactors{1, 0, 1})
-	b.ns.SetState(node.node, ppTestSetup.ActiveFlag, nodestate.Flags{}, 0)
+	b.ns.SetField(node.node, ppTestSetup.CapacityField, uint64(1))
 
 	callCh := make(chan struct{}, 1)
 	node.SetBalance(uint64(time.Minute), 0)

les/lespay/server/balance_tracker.go

@@ -42,7 +42,6 @@ type BalanceTrackerSetup struct {
 	BalanceField             nodestate.Field
 	// external connections
 	connAddressField, capacityField nodestate.Field
-	activeFlag, inactiveFlag        nodestate.Flags
 }
 
 // NewBalanceTrackerSetup creates a new BalanceTrackerSetup and initializes the fields
@@ -61,11 +60,9 @@ func NewBalanceTrackerSetup(setup *nodestate.Setup) BalanceTrackerSetup {
 }
 
 // Connect sets the fields used by BalanceTracker as an input
-func (bts *BalanceTrackerSetup) Connect(connAddressField, capacityField nodestate.Field, activeFlag, inactiveFlag nodestate.Flags) {
+func (bts *BalanceTrackerSetup) Connect(connAddressField, capacityField nodestate.Field) {
 	bts.connAddressField = connAddressField
 	bts.capacityField = capacityField
-	bts.activeFlag = activeFlag
-	bts.inactiveFlag = inactiveFlag
 }
 
 // BalanceTracker tracks positive and negative balances for connected nodes.
@@ -114,7 +111,18 @@ func NewBalanceTracker(ns *nodestate.NodeStateMachine, setup BalanceTrackerSetup
 			log.Error("Capacity field changed while node field is missing")
 			return
 		}
-		n.setCapacity(newValue.(uint64))
+
+		ov, _ := oldValue.(uint64)
+		nv, _ := newValue.(uint64)
+		if ov == 0 && nv != 0 {
+			n.activate()
+		}
+		if nv != 0 {
+			n.setCapacity(nv)
+		}
+		if ov != 0 && nv == 0 {
+			n.deactivate()
+		}
 	})
 
 	ns.SubscribeField(bt.connAddressField, func(node *enode.Node, state nodestate.Flags, oldValue, newValue interface{}) {
@@ -129,19 +137,6 @@ func NewBalanceTracker(ns *nodestate.NodeStateMachine, setup BalanceTrackerSetup
 		}
 	})
 
-	ns.SubscribeState(bt.inactiveFlag.Or(bt.activeFlag), func(n *enode.Node, oldState, newState nodestate.Flags) {
-		node, _ := ns.GetField(n, bt.BalanceField).(*NodeBalance)
-		if node == nil {
-			return
-		}
-		if newState.Equals(bt.activeFlag) {
-			node.activate()
-		}
-		if newState.Equals(bt.inactiveFlag) {
-			node.deactivate()
-		}
-	})
-
 	// The positive and negative balances of clients are stored in database
 	// and both of these decay exponentially over time. Delete them if the
 	// value is small enough.