Skip to content

Commit dfbb6df

Browse files
zsfelfoldizsfelfoldi
committed
les: renamed lespay to vflux
1 parent d36276d commit dfbb6df

30 files changed

+80
-80
lines changed

‎les/api.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/ethereum/go-ethereum/common/hexutil"
2525
"github.com/ethereum/go-ethereum/common/mclock"
26-
lps "github.com/ethereum/go-ethereum/les/lespay/server"
26+
vfs "github.com/ethereum/go-ethereum/les/vflux/server"
2727
"github.com/ethereum/go-ethereum/p2p/enode"
2828
)
2929

@@ -37,7 +37,7 @@ var (
3737
// PrivateLightServerAPI provides an API to access the LES light server.
3838
type PrivateLightServerAPI struct {
3939
server *LesServer
40-
defaultPosFactors, defaultNegFactors lps.PriceFactors
40+
defaultPosFactors, defaultNegFactors vfs.PriceFactors
4141
}
4242

4343
// NewPrivateLightServerAPI creates a new LES light server API.
@@ -107,7 +107,7 @@ func (api *PrivateLightServerAPI) clientInfo(c *clientInfo) map[string]interface
107107

108108
// setParams either sets the given parameters for a single connected client (if specified)
109109
// or the default parameters applicable to clients connected in the future
110-
func (api *PrivateLightServerAPI) setParams(params map[string]interface{}, client *clientInfo, posFactors, negFactors *lps.PriceFactors) (updateFactors bool, err error) {
110+
func (api *PrivateLightServerAPI) setParams(params map[string]interface{}, client *clientInfo, posFactors, negFactors *vfs.PriceFactors) (updateFactors bool, err error) {
111111
defParams := client == nil
112112
for name, value := range params {
113113
errValue := func() error {

‎les/client.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"github.com/ethereum/go-ethereum/eth/gasprice"
3737
"github.com/ethereum/go-ethereum/event"
3838
"github.com/ethereum/go-ethereum/internal/ethapi"
39-
lpc "github.com/ethereum/go-ethereum/les/lespay/client"
39+
vfc "github.com/ethereum/go-ethereum/les/vflux/client"
4040
"github.com/ethereum/go-ethereum/light"
4141
"github.com/ethereum/go-ethereum/log"
4242
"github.com/ethereum/go-ethereum/node"
@@ -58,7 +58,7 @@ type LightEthereum struct {
5858
txPool *light.TxPool
5959
blockchain *light.LightChain
6060
serverPool *serverPool
61-
valueTracker *lpc.ValueTracker
61+
valueTracker *vfc.ValueTracker
6262
dialCandidates enode.Iterator
6363
pruner *pruner
6464

@@ -108,7 +108,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) {
108108
engine: ethconfig.CreateConsensusEngine(stack, chainConfig, &config.Ethash, nil, false, chainDb),
109109
bloomRequests: make(chan chan *bloombits.Retrieval),
110110
bloomIndexer: core.NewBloomIndexer(chainDb, params.BloomBitsBlocksClient, params.HelperTrieConfirmations),
111-
valueTracker: lpc.NewValueTracker(lespayDb, &mclock.System{}, requestList, time.Minute, 1/float64(time.Hour), 1/float64(time.Hour*100), 1/float64(time.Hour*1000)),
111+
valueTracker: vfc.NewValueTracker(lespayDb, &mclock.System{}, requestList, time.Minute, 1/float64(time.Hour), 1/float64(time.Hour*100), 1/float64(time.Hour*1000)),
112112
p2pServer: stack.Server(),
113113
p2pConfig: &stack.Config().P2P,
114114
}
@@ -193,18 +193,18 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) {
193193
}
194194

195195
// vtSubscription implements serverPeerSubscriber
196-
type vtSubscription lpc.ValueTracker
196+
type vtSubscription vfc.ValueTracker
197197

198198
// registerPeer implements serverPeerSubscriber
199199
func (v *vtSubscription) registerPeer(p *serverPeer) {
200-
vt := (*lpc.ValueTracker)(v)
200+
vt := (*vfc.ValueTracker)(v)
201201
p.setValueTracker(vt, vt.Register(p.ID()))
202202
p.updateVtParams()
203203
}
204204

205205
// unregisterPeer implements serverPeerSubscriber
206206
func (v *vtSubscription) unregisterPeer(p *serverPeer) {
207-
vt := (*lpc.ValueTracker)(v)
207+
vt := (*vfc.ValueTracker)(v)
208208
vt.Unregister(p.ID())
209209
p.setValueTracker(nil, nil)
210210
}
@@ -263,9 +263,9 @@ func (s *LightEthereum) APIs() []rpc.API {
263263
Service: NewPrivateLightAPI(&s.lesCommons),
264264
Public: false,
265265
}, {
266-
Namespace: "lespay",
266+
Namespace: "vflux",
267267
Version: "1.0",
268-
Service: lpc.NewPrivateClientAPI(s.valueTracker),
268+
Service: vfc.NewPrivateClientAPI(s.valueTracker),
269269
Public: false,
270270
},
271271
}...)

‎les/clientpool.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"github.com/ethereum/go-ethereum/common/mclock"
2525
"github.com/ethereum/go-ethereum/ethdb"
26-
lps "github.com/ethereum/go-ethereum/les/lespay/server"
2726
"github.com/ethereum/go-ethereum/les/utils"
27+
vfs "github.com/ethereum/go-ethereum/les/vflux/server"
2828
"github.com/ethereum/go-ethereum/log"
2929
"github.com/ethereum/go-ethereum/p2p/enode"
3030
"github.com/ethereum/go-ethereum/p2p/enr"
@@ -64,17 +64,17 @@ const (
6464
// and negative banalce. Boeth positive balance and negative balance will decrease
6565
// exponentially. If the balance is low enough, then the record will be dropped.
6666
type clientPool struct {
67-
lps.BalanceTrackerSetup
68-
lps.PriorityPoolSetup
67+
vfs.BalanceTrackerSetup
68+
vfs.PriorityPoolSetup
6969
lock sync.Mutex
7070
clock mclock.Clock
7171
closed bool
7272
removePeer func(enode.ID)
7373
ns *nodestate.NodeStateMachine
74-
pp *lps.PriorityPool
75-
bt *lps.BalanceTracker
74+
pp *vfs.PriorityPool
75+
bt *vfs.BalanceTracker
7676

77-
defaultPosFactors, defaultNegFactors lps.PriceFactors
77+
defaultPosFactors, defaultNegFactors vfs.PriceFactors
7878
posExpTC, negExpTC uint64
7979
minCap uint64 // The minimal capacity value allowed for any client
8080
connectedBias time.Duration
@@ -101,7 +101,7 @@ type clientInfo struct {
101101
peer clientPoolPeer
102102
connected, priority bool
103103
connectedAt mclock.AbsTime
104-
balance *lps.NodeBalance
104+
balance *vfs.NodeBalance
105105
}
106106

107107
// newClientPool creates a new client pool
@@ -115,8 +115,8 @@ func newClientPool(ns *nodestate.NodeStateMachine, lespayDb ethdb.Database, minC
115115
connectedBias: connectedBias,
116116
removePeer: removePeer,
117117
}
118-
pool.bt = lps.NewBalanceTracker(ns, balanceTrackerSetup, lespayDb, clock, &utils.Expirer{}, &utils.Expirer{})
119-
pool.pp = lps.NewPriorityPool(ns, priorityPoolSetup, clock, minCap, connectedBias, 4)
118+
pool.bt = vfs.NewBalanceTracker(ns, balanceTrackerSetup, lespayDb, clock, &utils.Expirer{}, &utils.Expirer{})
119+
pool.pp = vfs.NewPriorityPool(ns, priorityPoolSetup, clock, minCap, connectedBias, 4)
120120

121121
// set default expiration constants used by tests
122122
// Note: server overwrites this if token sale is active
@@ -221,7 +221,7 @@ func (f *clientPool) connect(peer clientPoolPeer) (uint64, error) {
221221
}
222222
f.ns.SetField(node, clientInfoField, c)
223223
f.ns.SetField(node, connAddressField, freeID)
224-
if c.balance, _ = f.ns.GetField(node, f.BalanceField).(*lps.NodeBalance); c.balance == nil {
224+
if c.balance, _ = f.ns.GetField(node, f.BalanceField).(*vfs.NodeBalance); c.balance == nil {
225225
f.disconnect(peer)
226226
return 0, nil
227227
}
@@ -266,7 +266,7 @@ func (f *clientPool) disconnectNode(node *enode.Node) {
266266
}
267267

268268
// setDefaultFactors sets the default price factors applied to subsequently connected clients
269-
func (f *clientPool) setDefaultFactors(posFactors, negFactors lps.PriceFactors) {
269+
func (f *clientPool) setDefaultFactors(posFactors, negFactors vfs.PriceFactors) {
270270
f.lock.Lock()
271271
defer f.lock.Unlock()
272272

@@ -305,7 +305,7 @@ func (f *clientPool) setCapacity(node *enode.Node, freeID string, capacity uint6
305305
c = &clientInfo{node: node}
306306
f.ns.SetField(node, clientInfoField, c)
307307
f.ns.SetField(node, connAddressField, freeID)
308-
if c.balance, _ = f.ns.GetField(node, f.BalanceField).(*lps.NodeBalance); c.balance == nil {
308+
if c.balance, _ = f.ns.GetField(node, f.BalanceField).(*vfs.NodeBalance); c.balance == nil {
309309
log.Error("BalanceField is missing", "node", node.ID())
310310
return 0, fmt.Errorf("BalanceField of %064x is missing", node.ID())
311311
}
@@ -371,7 +371,7 @@ func (f *clientPool) forClients(ids []enode.ID, cb func(client *clientInfo)) {
371371
c = &clientInfo{node: node}
372372
f.ns.SetField(node, clientInfoField, c)
373373
f.ns.SetField(node, connAddressField, "")
374-
if c.balance, _ = f.ns.GetField(node, f.BalanceField).(*lps.NodeBalance); c.balance != nil {
374+
if c.balance, _ = f.ns.GetField(node, f.BalanceField).(*vfs.NodeBalance); c.balance != nil {
375375
cb(c)
376376
} else {
377377
log.Error("BalanceField is missing")

‎les/clientpool_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/ethereum/go-ethereum/common/mclock"
2626
"github.com/ethereum/go-ethereum/core/rawdb"
27-
lps "github.com/ethereum/go-ethereum/les/lespay/server"
27+
vfs "github.com/ethereum/go-ethereum/les/vflux/server"
2828
"github.com/ethereum/go-ethereum/p2p/enode"
2929
"github.com/ethereum/go-ethereum/p2p/enr"
3030
"github.com/ethereum/go-ethereum/p2p/nodestate"
@@ -100,7 +100,7 @@ func getBalance(pool *clientPool, p *poolTestPeer) (pos, neg uint64) {
100100
if temp {
101101
pool.ns.SetField(p.node, connAddressField, p.freeClientId())
102102
}
103-
n, _ := pool.ns.GetField(p.node, pool.BalanceField).(*lps.NodeBalance)
103+
n, _ := pool.ns.GetField(p.node, pool.BalanceField).(*vfs.NodeBalance)
104104
pos, neg = n.GetBalance()
105105
if temp {
106106
pool.ns.SetField(p.node, connAddressField, nil)
@@ -138,7 +138,7 @@ func testClientPool(t *testing.T, activeLimit, clientCount, paidCount int, rando
138138
pool.ns.Start()
139139

140140
pool.setLimits(activeLimit, uint64(activeLimit))
141-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
141+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
142142

143143
// pool should accept new peers up to its connected limit
144144
for i := 0; i < activeLimit; i++ {
@@ -243,7 +243,7 @@ func TestConnectPaidClient(t *testing.T) {
243243
pool.ns.Start()
244244
defer pool.stop()
245245
pool.setLimits(10, uint64(10))
246-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
246+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
247247

248248
// Add balance for an external client and mark it as paid client
249249
addBalance(pool, newPoolTestPeer(0, nil).node.ID(), int64(time.Minute))
@@ -259,7 +259,7 @@ func TestConnectPaidClientToSmallPool(t *testing.T) {
259259
pool.ns.Start()
260260
defer pool.stop()
261261
pool.setLimits(10, uint64(10)) // Total capacity limit is 10
262-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
262+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
263263

264264
// Add balance for an external client and mark it as paid client
265265
addBalance(pool, newPoolTestPeer(0, nil).node.ID(), int64(time.Minute))
@@ -278,7 +278,7 @@ func TestConnectPaidClientToFullPool(t *testing.T) {
278278
pool.ns.Start()
279279
defer pool.stop()
280280
pool.setLimits(10, uint64(10)) // Total capacity limit is 10
281-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
281+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
282282

283283
for i := 0; i < 10; i++ {
284284
addBalance(pool, newPoolTestPeer(i, nil).node.ID(), int64(time.Second*20))
@@ -309,7 +309,7 @@ func TestPaidClientKickedOut(t *testing.T) {
309309
pool.bt.SetExpirationTCs(0, 0)
310310
defer pool.stop()
311311
pool.setLimits(10, uint64(10)) // Total capacity limit is 10
312-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
312+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
313313

314314
for i := 0; i < 10; i++ {
315315
addBalance(pool, newPoolTestPeer(i, kickedCh).node.ID(), 10000000000) // 10 second allowance
@@ -339,7 +339,7 @@ func TestConnectFreeClient(t *testing.T) {
339339
pool.ns.Start()
340340
defer pool.stop()
341341
pool.setLimits(10, uint64(10))
342-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
342+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
343343
if cap, _ := pool.connect(newPoolTestPeer(0, nil)); cap == 0 {
344344
t.Fatalf("Failed to connect free client")
345345
}
@@ -356,7 +356,7 @@ func TestConnectFreeClientToFullPool(t *testing.T) {
356356
pool.ns.Start()
357357
defer pool.stop()
358358
pool.setLimits(10, uint64(10)) // Total capacity limit is 10
359-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
359+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
360360

361361
for i := 0; i < 10; i++ {
362362
pool.connect(newPoolTestPeer(i, nil))
@@ -386,7 +386,7 @@ func TestFreeClientKickedOut(t *testing.T) {
386386
pool.ns.Start()
387387
defer pool.stop()
388388
pool.setLimits(10, uint64(10)) // Total capacity limit is 10
389-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
389+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
390390

391391
for i := 0; i < 10; i++ {
392392
pool.connect(newPoolTestPeer(i, kicked))
@@ -428,7 +428,7 @@ func TestPositiveBalanceCalculation(t *testing.T) {
428428
pool.ns.Start()
429429
defer pool.stop()
430430
pool.setLimits(10, uint64(10)) // Total capacity limit is 10
431-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
431+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
432432

433433
addBalance(pool, newPoolTestPeer(0, kicked).node.ID(), int64(time.Minute*3))
434434
testPriorityConnect(t, pool, newPoolTestPeer(0, kicked), 10, true)
@@ -452,7 +452,7 @@ func TestDowngradePriorityClient(t *testing.T) {
452452
pool.ns.Start()
453453
defer pool.stop()
454454
pool.setLimits(10, uint64(10)) // Total capacity limit is 10
455-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
455+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 1})
456456

457457
p := newPoolTestPeer(0, kicked)
458458
addBalance(pool, p.node.ID(), int64(time.Minute))
@@ -487,7 +487,7 @@ func TestNegativeBalanceCalculation(t *testing.T) {
487487
pool.ns.Start()
488488
defer pool.stop()
489489
pool.setLimits(10, uint64(10)) // Total capacity limit is 10
490-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1e-3, CapacityFactor: 0, RequestFactor: 1}, lps.PriceFactors{TimeFactor: 1e-3, CapacityFactor: 0, RequestFactor: 1})
490+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1e-3, CapacityFactor: 0, RequestFactor: 1}, vfs.PriceFactors{TimeFactor: 1e-3, CapacityFactor: 0, RequestFactor: 1})
491491

492492
for i := 0; i < 10; i++ {
493493
pool.connect(newPoolTestPeer(i, nil))
@@ -564,7 +564,7 @@ func TestInactiveClient(t *testing.T) {
564564
if p2.cap != 0 {
565565
t.Fatalf("Failed to deactivate peer #2")
566566
}
567-
pool.setDefaultFactors(lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 0}, lps.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 0})
567+
pool.setDefaultFactors(vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 0}, vfs.PriceFactors{TimeFactor: 1, CapacityFactor: 0, RequestFactor: 0})
568568
p4 := newPoolTestPeer(4, nil)
569569
addBalance(pool, p4.node.ID(), 1500*int64(time.Second))
570570
// p1: 1000 p2: 500 p3: 2000 p4: 1500

‎les/peer.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ import (
3232
"github.com/ethereum/go-ethereum/core/forkid"
3333
"github.com/ethereum/go-ethereum/core/types"
3434
"github.com/ethereum/go-ethereum/les/flowcontrol"
35-
lpc "github.com/ethereum/go-ethereum/les/lespay/client"
36-
lps "github.com/ethereum/go-ethereum/les/lespay/server"
3735
"github.com/ethereum/go-ethereum/les/utils"
36+
vfc "github.com/ethereum/go-ethereum/les/vflux/client"
37+
vfs "github.com/ethereum/go-ethereum/les/vflux/server"
3838
"github.com/ethereum/go-ethereum/light"
3939
"github.com/ethereum/go-ethereum/p2p"
4040
"github.com/ethereum/go-ethereum/params"
@@ -349,8 +349,8 @@ type serverPeer struct {
349349

350350
fcServer *flowcontrol.ServerNode // Client side mirror token bucket.
351351
vtLock sync.Mutex
352-
valueTracker *lpc.ValueTracker
353-
nodeValueTracker *lpc.NodeValueTracker
352+
valueTracker *vfc.ValueTracker
353+
nodeValueTracker *vfc.NodeValueTracker
354354
sentReqs map[uint64]sentReqEntry
355355

356356
// Statistics
@@ -676,7 +676,7 @@ func (p *serverPeer) Handshake(genesis common.Hash, forkid forkid.ID, forkFilter
676676

677677
// setValueTracker sets the value tracker references for connected servers. Note that the
678678
// references should be removed upon disconnection by setValueTracker(nil, nil).
679-
func (p *serverPeer) setValueTracker(vt *lpc.ValueTracker, nvt *lpc.NodeValueTracker) {
679+
func (p *serverPeer) setValueTracker(vt *vfc.ValueTracker, nvt *vfc.NodeValueTracker) {
680680
p.vtLock.Lock()
681681
p.valueTracker = vt
682682
p.nodeValueTracker = nvt
@@ -739,17 +739,17 @@ func (p *serverPeer) answeredRequest(id uint64) {
739739
return
740740
}
741741
var (
742-
vtReqs [2]lpc.ServedRequest
742+
vtReqs [2]vfc.ServedRequest
743743
reqCount int
744744
)
745745
m := requestMapping[e.reqType]
746746
if m.rest == -1 || e.amount <= 1 {
747747
reqCount = 1
748-
vtReqs[0] = lpc.ServedRequest{ReqType: uint32(m.first), Amount: e.amount}
748+
vtReqs[0] = vfc.ServedRequest{ReqType: uint32(m.first), Amount: e.amount}
749749
} else {
750750
reqCount = 2
751-
vtReqs[0] = lpc.ServedRequest{ReqType: uint32(m.first), Amount: 1}
752-
vtReqs[1] = lpc.ServedRequest{ReqType: uint32(m.rest), Amount: e.amount - 1}
751+
vtReqs[0] = vfc.ServedRequest{ReqType: uint32(m.first), Amount: 1}
752+
vtReqs[1] = vfc.ServedRequest{ReqType: uint32(m.rest), Amount: e.amount - 1}
753753
}
754754
dt := time.Duration(mclock.Now() - e.at)
755755
vt.Served(nvt, vtReqs[:reqCount], dt)
@@ -765,7 +765,7 @@ type clientPeer struct {
765765
responseLock sync.Mutex
766766
responseCount uint64 // Counter to generate an unique id for request processing.
767767

768-
balance *lps.NodeBalance
768+
balance *vfs.NodeBalance
769769

770770
// invalidLock is used for protecting invalidCount.
771771
invalidLock sync.RWMutex

0 commit comments

Comments
 (0)