les: fixed broken tests

ethereum · Feb 19, 2021 · 7cde103 · 7cde103
1 parent f64a4e2
commit 7cde103
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/les/client.go b/les/client.go
@@ -51,7 +51,7 @@ import (
 var (
 	clientSetup       = &nodestate.Setup{Version: 1}
 	serverPeerField   = clientSetup.NewField("serverPeer", reflect.TypeOf(&serverPeer{}))
-	valueTrackerSetup = lpc.NewValueTrackerSetup(clientSetup)
+	valueTrackerSetup = vfc.NewValueTrackerSetup(clientSetup)
 )
 
 func init() {
@@ -104,7 +104,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) {
 	}
 	log.Info("Initialised chain configuration", "config", chainConfig)
 
-	ns := nodestate.NewNodeStateMachine(lespayDb, []byte("ns:"), &mclock.System{}, clientSetup)
+	ns := nodestate.NewNodeStateMachine(lesDb, []byte("ns:"), &mclock.System{}, clientSetup)
 	peers := newServerPeerSet(ns)
 	leth := &LightEthereum{
 		lesCommons: lesCommons{

diff --git a/les/peer_test.go b/les/peer_test.go
@@ -58,6 +58,7 @@ func TestPeerSubscription(t *testing.T) {
 	sub := newTestServerPeerSub()
 	peers.subscribe(sub)
 	ns.Start()
+	peers.open()
 	defer ns.Stop()
 
 	checkIds := func(expect []string) {

diff --git a/les/serverpool.go b/les/serverpool.go
@@ -166,7 +166,7 @@ func newServerPool(ns *nodestate.NodeStateMachine, db ethdb.KeyValueStore, vt *v
 
 	s.ns.SubscribeField(valueTrackerSetup.ValueTrackerField, func(node *enode.Node, state nodestate.Flags, oldValue, newValue interface{}) {
 		if newValue != nil {
-			nvt := newValue.(*lpc.NodeValueTracker)
+			nvt := newValue.(*vfc.NodeValueTracker)
 			s.ns.SetStateSub(node, sfConnected, sfDialing.Or(sfWaitDialTimeout), 0)
 			s.ns.SetFieldSub(node, sfiConnectedStats, nvt.RtStats())
 			p := s.ns.GetField(node, serverPeerField).(*serverPeer)

diff --git a/les/test_helper.go b/les/test_helper.go
@@ -538,6 +538,7 @@ func newClientServerEnv(t *testing.T, blocks int, protocol int, callback indexer
 	client := newTestClientHandler(b, odr, cIndexers, cdb, speers, ulcServers, ulcFraction)
 
 	ns.Start()
+	speers.open()
 	scIndexer.Start(server.blockchain)
 	sbIndexer.Start(server.blockchain)
 	ccIndexer.Start(client.backend.blockchain)