logos-messaging/logos-messaging-go-bindings
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-go-bindings.git synced 2026-01-02 14:03:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: pass ctx in dial functions

Browse Source
This commit is contained in:
Gabriel mermelstein 2024-12-17 18:28:34 +01:00
parent 7eb7647599
commit bc242813ad
No known key found for this signature in database
GPG Key ID: 82B8134785FEAE0D
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
waku/nwaku.go
View File

@ -417,10 +417,8 @@ func (w *Waku) ListenAddresses() ([]multiaddr.Multiaddr, error) {
return w.node.ListenAddresses()
}
func (w *Waku) DialPeer(address multiaddr.Multiaddr) error {
func (w *Waku) DialPeer(ctx context.Context, address multiaddr.Multiaddr) error {
// Using WakuConnect so it matches the go-waku's behavior and terminology
ctx, cancel := context.WithTimeout(w.ctx, requestTimeout)
defer cancel()
return w.node.Connect(ctx, address)
}
@ -429,9 +427,7 @@ func (w *Waku) RelayPublish(ctx context.Context, message *pb.WakuMessage, pubsub
return w.node.RelayPublish(ctx, message, pubsubTopic)
}
func (w *Waku) DialPeerByID(peerID peer.ID, protocol libp2pproto.ID) error {
ctx, cancel := context.WithTimeout(w.ctx, requestTimeout)
defer cancel()
func (w *Waku) DialPeerByID(ctx context.Context, peerID peer.ID, protocol libp2pproto.ID) error {
return w.node.DialPeerByID(ctx, peerID, protocol)
}

18
waku/nwaku_test.go
View File

@ -103,7 +103,9 @@ func TestBasicWaku(t *testing.T) {
require.True(t, isDisconnected, "nwaku should be disconnected from the store node")
// Re-connect
err = w.DialPeer(storeNodeMa)
ctx, cancel := context.WithTimeout(context.Background(), requestTimeout)
defer cancel()
err = w.DialPeer(ctx, storeNodeMa)
require.NoError(t, err)
// Check that we are connected again
@ -384,7 +386,9 @@ func TestDial(t *testing.T) {
require.NoError(t, err)
require.True(t, receiverPeerCount == 0, "Receiver node should have no connected peers")
// Dial
err = dialerNode.DialPeer(receiverMultiaddr[0])
ctx, cancel := context.WithTimeout(context.Background(), requestTimeout)
defer cancel()
err = dialerNode.DialPeer(ctx, receiverMultiaddr[0])
require.NoError(t, err)
time.Sleep(1 * time.Second)
// Check that both nodes now have one connected peer
@ -438,7 +442,9 @@ func TestRelay(t *testing.T) {
require.NotNil(t, receiverMultiaddr)
// Dial so they become peers
err = senderNode.DialPeer(receiverMultiaddr[0])
ctx1, cancel1 := context.WithTimeout(context.Background(), requestTimeout)
defer cancel1()
err = senderNode.DialPeer(ctx1, receiverMultiaddr[0])
require.NoError(t, err)
time.Sleep(1 * time.Second)
// Check that both nodes now have one connected peer
@ -457,9 +463,9 @@ func TestRelay(t *testing.T) {
}
// send message
pubsubTopic := FormatWakuRelayTopic(senderNodeWakuConfig.ClusterID, senderNodeWakuConfig.Shards[0])
ctx, cancel := context.WithTimeout(context.Background(), requestTimeout)
defer cancel()
senderNode.RelayPublish(ctx, message, pubsubTopic)
ctx2, cancel2 := context.WithTimeout(context.Background(), requestTimeout)
defer cancel2()
senderNode.RelayPublish(ctx2, message, pubsubTopic)
wg := sync.WaitGroup{}
wg.Add(1)