Change gossip container SendConfig to nodeIDs

ava-labs · Nov 22, 2024 · 325d861 · 325d861
1 parent 0ef6982
commit 325d861
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/internal/gossiper/strategy.go b/internal/gossiper/strategy.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/utils/set"
 )
 
@@ -58,8 +57,8 @@ func (g *TargetProposers[T]) Target(ctx context.Context, txs []T) ([]GossipConta
 
 	return []GossipContainer[T]{
 		{
-			SendConfig: common.SendConfig{NodeIDs: recipients},
-			Txs:        txs,
+			NodeIDs: recipients,
+			Txs:     txs,
 		},
 	}, nil
 }
@@ -86,8 +85,8 @@ func (t *TargetAssigner[T]) Target(ctx context.Context, txs []T) ([]GossipContai
 	gossipContainers := make([]GossipContainer[T], 0, len(targetedGossip))
 	for targetedNodeID, txs := range targetedGossip {
 		gossipContainers = append(gossipContainers, GossipContainer[T]{
-			SendConfig: common.SendConfig{NodeIDs: set.Of(targetedNodeID)},
-			Txs:        txs,
+			NodeIDs: set.Of(targetedNodeID),
+			Txs:     txs,
 		})
 	}
 	return gossipContainers, nil

diff --git a/internal/gossiper/target.go b/internal/gossiper/target.go
@@ -14,6 +14,7 @@ import (
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/trace"
 	"github.com/ava-labs/avalanchego/utils/logging"
+	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/utils/timer"
 	"github.com/ava-labs/avalanchego/vms/proposervm/proposer"
 	"github.com/prometheus/client_golang/prometheus"
@@ -66,8 +67,8 @@ type TargetConfig struct {
 }
 
 type GossipContainer[T any] struct {
-	SendConfig common.SendConfig
-	Txs        []T
+	NodeIDs set.Set[ids.NodeID]
+	Txs     []T
 }
 
 func DefaultTargetConfig() *TargetConfig {
@@ -353,7 +354,7 @@ func (g *Target[T]) sendTxs(ctx context.Context, txs []T) error {
 		}
 
 		// Send gossip to specified peers
-		if err := g.client.AppGossip(ctx, gossipContainer.SendConfig, b); err != nil {
+		if err := g.client.AppGossip(ctx, common.SendConfig{NodeIDs: gossipContainer.NodeIDs}, b); err != nil {
 			return err
 		}
 	}