chore: fix missing nodeInfo.Channels initialization

dashpay · Feb 7, 2024 · 64038d3 · 64038d3
1 parent 0e1e267
commit 64038d3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/internal/libs/sync/concurrent_slice_test.go b/internal/libs/sync/concurrent_slice_test.go
@@ -22,12 +22,12 @@ func TestConcurrentSlice(t *testing.T) {
 	}
 
 	// Test Set
-	s.Set(3, 5)
+	s.Set(1, 5)
 
 	// Test ToSlice
 	slice := s.ToSlice()
-	if len(slice) != 4 || slice[3] != 4 {
-		t.Errorf("Expected ToSlice to return [1 2 3 4], got %v", slice)
+	if len(slice) != 4 || slice[3] != 4 || slice[1] != 5 {
+		t.Errorf("Expected ToSlice to return [1 5 3 4], got %v", slice)
 	}
 
 	// Test Reset

diff --git a/internal/p2p/p2ptest/network.go b/internal/p2p/p2ptest/network.go
@@ -12,6 +12,7 @@ import (
 	"github.com/dashpay/tenderdash/config"
 	"github.com/dashpay/tenderdash/crypto"
 	"github.com/dashpay/tenderdash/crypto/ed25519"
+	tmsync "github.com/dashpay/tenderdash/internal/libs/sync"
 	"github.com/dashpay/tenderdash/internal/p2p"
 	p2pclient "github.com/dashpay/tenderdash/internal/p2p/client"
 	"github.com/dashpay/tenderdash/libs/log"
@@ -272,6 +273,7 @@ func (n *Network) MakeNode(ctx context.Context, t *testing.T, proTxHash crypto.P
 		ListenAddr: "0.0.0.0:0", // FIXME: We have to fake this for now.
 		Moniker:    string(nodeID),
 		ProTxHash:  proTxHash.Copy(),
+		Channels:   tmsync.NewConcurrentSlice[uint16](),
 	}
 
 	transport := n.memoryNetwork.CreateTransport(nodeID)

diff --git a/internal/p2p/router_test.go b/internal/p2p/router_test.go
@@ -304,6 +304,7 @@ func TestRouter_AcceptPeers(t *testing.T) {
 				ListenAddr: "0.0.0.0:0",
 				Network:    "other-network",
 				Moniker:    string(peerID),
+				Channels:   tmsync.NewConcurrentSlice[uint16](),
 			},
 			peerKey.PubKey(),
 			false,
@@ -505,6 +506,7 @@ func TestRouter_DialPeers(t *testing.T) {
 				ListenAddr: "0.0.0.0:0",
 				Network:    "other-network",
 				Moniker:    string(peerID),
+				Channels:   tmsync.NewConcurrentSlice[uint16](),
 			},
 			peerKey.PubKey(),
 			nil,

diff --git a/internal/p2p/transport_test.go b/internal/p2p/transport_test.go
@@ -291,7 +291,10 @@ func TestConnection_Handshake(t *testing.T) {
 			},
 		}
 		bKey := ed25519.GenPrivKey()
-		bInfo := types.NodeInfo{NodeID: types.NodeIDFromPubKey(bKey.PubKey())}
+		bInfo := types.NodeInfo{
+			NodeID:   types.NodeIDFromPubKey(bKey.PubKey()),
+			Channels: tmsync.NewConcurrentSlice[uint16](),
+		}
 
 		errCh := make(chan error, 1)
 		go func() {
@@ -641,13 +644,13 @@ func dialAcceptHandshake(ctx context.Context, t *testing.T, a, b p2p.Transport)
 	errCh := make(chan error, 1)
 	go func() {
 		privKey := ed25519.GenPrivKey()
-		nodeInfo := types.NodeInfo{NodeID: types.NodeIDFromPubKey(privKey.PubKey())}
+		nodeInfo := types.NodeInfo{NodeID: types.NodeIDFromPubKey(privKey.PubKey()), Channels: tmsync.NewConcurrentSlice[uint16]()}
 		_, _, err := ba.Handshake(ctx, 0, nodeInfo, privKey)
 		errCh <- err
 	}()
 
 	privKey := ed25519.GenPrivKey()
-	nodeInfo := types.NodeInfo{NodeID: types.NodeIDFromPubKey(privKey.PubKey())}
+	nodeInfo := types.NodeInfo{NodeID: types.NodeIDFromPubKey(privKey.PubKey()), Channels: tmsync.NewConcurrentSlice[uint16]()}
 	_, _, err := ab.Handshake(ctx, 0, nodeInfo, privKey)
 	require.NoError(t, err)
 

diff --git a/types/node_info.go b/types/node_info.go
@@ -97,6 +97,10 @@ func (info NodeInfo) Validate() error {
 	}
 
 	// Validate Channels - ensure max and check for duplicates.
+	if info.Channels == nil {
+		return fmt.Errorf("info.Channels is nil")
+	}
+
 	if info.Channels.Len() > maxNumChannels {
 		return fmt.Errorf("info.Channels is too long (%v). Max is %v", info.Channels.Len(), maxNumChannels)
 	}
@@ -235,6 +239,7 @@ func NodeInfoFromProto(pb *tmp2p.NodeInfo) (NodeInfo, error) {
 		ListenAddr: pb.ListenAddr,
 		Network:    pb.Network,
 		Version:    pb.Version,
+		Channels:   tmsync.NewConcurrentSlice[uint16](),
 		Moniker:    pb.Moniker,
 		Other: NodeInfoOther{
 			TxIndex:    pb.Other.TxIndex,