nit

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
ava-labs · Nov 15, 2023 · 97af976 · 97af976
1 parent faf3142
commit 97af976
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.10.0
-	github.com/ava-labs/avalanchego v1.10.16-0.20231109165513-2ad374a26466
+	github.com/ava-labs/avalanchego v1.10.16-0.20231115210806-accd487d239b
 	github.com/cespare/cp v0.1.0
 	github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811
 	github.com/davecgh/go-spew v1.1.1

diff --git a/go.sum b/go.sum
@@ -55,8 +55,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/ava-labs/avalanchego v1.10.16-0.20231109165513-2ad374a26466 h1:pio9Anyks/+x2JTCrQCoebYvJLjWgjHFsAMdwouHhNE=
-github.com/ava-labs/avalanchego v1.10.16-0.20231109165513-2ad374a26466/go.mod h1:LX4Cg3G5j5whMRxHzxO/+sMNII+swK+8GAyoBRu6kZE=
+github.com/ava-labs/avalanchego v1.10.16-0.20231115210806-accd487d239b h1:CLjjX92vMC+iQi1Q8WPE9J9TQMZ59ZBJ/ZNOSV9Oqgk=
+github.com/ava-labs/avalanchego v1.10.16-0.20231115210806-accd487d239b/go.mod h1:LX4Cg3G5j5whMRxHzxO/+sMNII+swK+8GAyoBRu6kZE=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
@@ -549,8 +549,8 @@ func (vm *VM) Initialize(
 	}
 
 	// initialize peer network
-	vm.validators = p2p.NewValidators(vm.ctx.Log, vm.ctx.SubnetID, vm.ctx.ValidatorState, maxValidatorSetStaleness)
 	p2pNetwork := p2p.NewNetwork(vm.ctx.Log, appSender, vm.sdkMetrics, "p2p")
+	vm.validators = p2p.NewValidators(p2pNetwork, vm.ctx.SubnetID, vm.ctx.ValidatorState, maxValidatorSetStaleness)
 	vm.networkCodec = message.Codec
 	vm.Network = peer.NewNetwork(p2pNetwork, appSender, vm.networkCodec, message.CrossChainCodec, chainCtx.NodeID, vm.config.MaxOutboundActiveRequests, vm.config.MaxOutboundActiveCrossChainRequests)
 	vm.client = peer.NewNetworkClient(vm.Network)
@@ -1035,7 +1035,7 @@ func (vm *VM) initBlockBuilding() error {
 			Handler:   ethTxGossipHandler,
 		},
 	}
-	ethTxGossipClient, err := vm.Network.RegisterAppProtocol(ethTxGossipProtocol, ethTxGossipHandler, p2p.WithNodeSampler(vm.validators))
+	ethTxGossipClient, err := vm.Network.RegisterAppProtocol(ethTxGossipProtocol, ethTxGossipHandler, p2p.WithValidatorSampling(vm.validators))
 	if err != nil {
 		return err
 	}
@@ -1053,7 +1053,7 @@ func (vm *VM) initBlockBuilding() error {
 		},
 	}
 
-	atomicTxGossipClient, err := vm.Network.RegisterAppProtocol(atomicTxGossipProtocol, atomicTxGossipHandler, p2p.WithNodeSampler(vm.validators))
+	atomicTxGossipClient, err := vm.Network.RegisterAppProtocol(atomicTxGossipProtocol, atomicTxGossipHandler, p2p.WithValidatorSampling(vm.validators))
 	if err != nil {
 		return err
 	}