Skip to content

Commit 12a50ed

Browse files
committed
wip fix unit test
1 parent 34dddbc commit 12a50ed

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

local/node.go

+11-8
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,19 @@ func (node *localNode) AttachPeer(ctx context.Context, router router.InboundHand
9393
return nil, err
9494
}
9595
tlsConfg := peer.TLSConfig(*tlsCert, nil)
96-
counter := prometheus.NewCounter(prometheus.CounterOpts{})
97-
clientUpgrader := peer.NewTLSClientUpgrader(tlsConfg, counter, time.Time{})
96+
clientUpgrader := peer.NewTLSClientUpgrader(
97+
tlsConfg,
98+
prometheus.NewCounter(prometheus.CounterOpts{}),
99+
version.GetDurangoTime(node.networkID),
100+
)
98101
conn, err := node.getConnFunc(ctx, node)
99102
if err != nil {
100103
return nil, err
101104
}
105+
peerID, conn, cert, err := clientUpgrader.Upgrade(conn)
106+
if err != nil {
107+
return nil, err
108+
}
102109
mc, err := message.NewCreator(
103110
logging.NoLog{},
104111
prometheus.NewRegistry(),
@@ -127,7 +134,7 @@ func (node *localNode) AttachPeer(ctx context.Context, router router.InboundHand
127134
if err != nil {
128135
return nil, err
129136
}
130-
signerIP := ips.NewDynamicIPPort(net.IPv6zero, 0)
137+
signerIP := ips.NewDynamicIPPort(net.IPv6zero, 1)
131138
tls := tlsCert.PrivateKey.(crypto.Signer)
132139
config := &peer.Config{
133140
Metrics: metrics,
@@ -149,16 +156,12 @@ func (node *localNode) AttachPeer(ctx context.Context, router router.InboundHand
149156
SupportedACPs: []uint32{},
150157
ObjectedACPs: []uint32{},
151158
}
152-
_, conn, cert, err := clientUpgrader.Upgrade(conn)
153-
if err != nil {
154-
return nil, err
155-
}
156159

157160
p := peer.Start(
158161
config,
159162
conn,
160163
cert,
161-
ids.NodeIDFromCert(staking.CertificateFromX509(tlsCert.Leaf)),
164+
peerID,
162165
peer.NewBlockingMessageQueue(
163166
config.Metrics,
164167
logging.NoLog{},

local/node_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ func TestAttachPeer(t *testing.T) {
204204
node := localNode{
205205
nodeID: ids.GenerateTestNodeID(),
206206
networkID: constants.MainnetID,
207+
p2pPort: 1,
207208
getConnFunc: func(ctx context.Context, n node.Node) (net.Conn, error) {
208209
return peerConn, nil
209210
},

0 commit comments

Comments
 (0)