From 81c1572072d9037d9c9babebbe96d6552a062a6c Mon Sep 17 00:00:00 2001 From: Gabriel mermelstein Date: Thu, 9 Jan 2025 17:14:01 +0100 Subject: [PATCH] removing cancel func --- waku/nwaku.go | 4 +--- waku/nwaku_test.go | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/waku/nwaku.go b/waku/nwaku.go index 5deab56..025ec25 100644 --- a/waku/nwaku.go +++ b/waku/nwaku.go @@ -433,7 +433,6 @@ type WakuNode struct { wakuCtx unsafe.Pointer wakuCfg *WakuConfig logger *zap.Logger - cancel context.CancelFunc MsgChan chan common.Envelope TopicHealthChan chan topicHealth } @@ -442,6 +441,7 @@ func newWakuNode(config *WakuConfig, logger *zap.Logger) (*WakuNode, error) { n := &WakuNode{ wakuCfg: config, + logger: logger, } wg := sync.WaitGroup{} @@ -469,7 +469,6 @@ func newWakuNode(config *WakuConfig, logger *zap.Logger) (*WakuNode, error) { n.MsgChan = make(chan common.Envelope, MsgChanBufferSize) n.TopicHealthChan = make(chan topicHealth, TopicHealthChanBufferSize) - n.logger = logger.Named("nwaku") // Notice that the events for self node are handled by the 'MyEventCallback' method C.cGoWakuSetEventCallback(n.wakuCtx) @@ -544,7 +543,6 @@ func (n *WakuNode) OnEvent(eventStr string) { } func (n *WakuNode) parseMessageEvent(eventStr string) { - fmt.Println("----------- got message event: ", eventStr) envelope, err := common.NewEnvelope(eventStr) if err != nil { n.logger.Error("could not parse message", zap.Error(err)) diff --git a/waku/nwaku_test.go b/waku/nwaku_test.go index 3286526..0caf000 100644 --- a/waku/nwaku_test.go +++ b/waku/nwaku_test.go @@ -35,6 +35,9 @@ func TestBasicWaku(t *testing.T) { // ctx := context.Background() + logger, err := zap.NewDevelopment() + require.NoError(t, err) + nwakuConfig := WakuConfig{ Nodekey: "11d0dcea28e86f81937a3bd1163473c7fbc0a0db54fd72914849bc47bdf78710", Relay: true, @@ -50,7 +53,7 @@ func TestBasicWaku(t *testing.T) { storeNodeMa, err := ma.NewMultiaddr(storeNodeInfo.ListenAddresses[0]) require.NoError(t, err) - w, err := newWakuNode(&nwakuConfig, nil) + w, err := newWakuNode(&nwakuConfig, logger.Named("nwaku")) require.NoError(t, err) require.NoError(t, w.Start())