@@ -642,66 +642,67 @@ func TestStoreQueryWithoutData(t *testing.T) {
642642 Debug ("Test successfully verified that store query returns only message hashes when IncludeData is false" )
643643}
644644
645- func TestStoreQueryWithWrongContentTopic (t * testing.T ) {
646- Debug ("Starting test to verify store query fails when using an incorrect content topic and an old timestamp" )
645+ /*
646+ func TestStoreQueryWithWrongContentTopic(t *testing.T) {
647+ Debug("Starting test to verify store query fails when using an incorrect content topic and an old timestamp")
647648
648- node1Config := DefaultWakuConfig
649- node1Config .Relay = true
649+ node1Config := DefaultWakuConfig
650+ node1Config.Relay = true
650651
651- Debug ("Creating Node1 with Relay enabled" )
652- node1 , err := StartWakuNode ("Node1" , & node1Config )
653- require .NoError (t , err , "Failed to start Node1" )
652+ Debug("Creating Node1 with Relay enabled")
653+ node1, err := StartWakuNode("Node1", &node1Config)
654+ require.NoError(t, err, "Failed to start Node1")
654655
655- node2Config := DefaultWakuConfig
656- node2Config .Relay = true
657- node2Config .Store = true
656+ node2Config := DefaultWakuConfig
657+ node2Config.Relay = true
658+ node2Config.Store = true
658659
659- Debug ("Creating Node2 with Store enabled" )
660- node2 , err := StartWakuNode ("Node2" , & node2Config )
661- require .NoError (t , err , "Failed to start Node2" )
660+ Debug("Creating Node2 with Store enabled")
661+ node2, err := StartWakuNode("Node2", &node2Config)
662+ require.NoError(t, err, "Failed to start Node2")
662663
663- node3Config := DefaultWakuConfig
664- node3Config .Relay = true
665-
666- Debug ("Creating Node3" )
667- node3 , err := StartWakuNode ("Node3" , & node3Config )
668- require .NoError (t , err , "Failed to start Node3" )
664+ node3Config := DefaultWakuConfig
665+ node3Config.Relay = true
669666
670- defer func () {
671- Debug ("Stopping and destroying all Waku nodes" )
672- node1 .StopAndDestroy ()
673- node2 .StopAndDestroy ()
674- node3 .StopAndDestroy ()
675- }()
667+ Debug("Creating Node3")
668+ node3, err := StartWakuNode("Node3", &node3Config)
669+ require.NoError(t, err, "Failed to start Node3")
676670
677- Debug ("Connecting Node2 to Node1" )
678- err = node2 .ConnectPeer (node1 )
679- require .NoError (t , err , "Failed to connect Node2 to Node1" )
671+ defer func() {
672+ Debug("Stopping and destroying all Waku nodes")
673+ node1.StopAndDestroy()
674+ node2.StopAndDestroy()
675+ node3.StopAndDestroy()
676+ }()
680677
681- Debug ("Connecting Node3 to Node2 " )
682- err = node3 .ConnectPeer (node2 )
683- require .NoError (t , err , "Failed to connect Node3 to Node2 " )
678+ Debug("Connecting Node2 to Node1 ")
679+ err = node2 .ConnectPeer(node1 )
680+ require.NoError(t, err, "Failed to connect Node2 to Node1 ")
684681
685- Debug ("Recording timestamp before message publication" )
686- queryTimestamp := proto .Int64 (time .Now ().UnixNano ())
682+ Debug("Connecting Node3 to Node2")
683+ err = node3.ConnectPeer(node2)
684+ require.NoError(t, err, "Failed to connect Node3 to Node2")
687685
688- Debug ("Sender Node1 is publishing a message with a correct content topic" )
689- message := node1 .CreateMessage ()
690- msgHash , err := node1 .RelayPublishNoCTX (DefaultPubsubTopic , message )
691- require .NoError (t , err )
692- require .NotEmpty (t , msgHash )
686+ Debug("Recording timestamp before message publication")
687+ queryTimestamp := proto.Int64(time.Now().UnixNano())
693688
694- Debug ("Querying stored messages from Node3 with an incorrect content topic and an old timestamp " )
695- storeQueryRequest := & common. StoreQueryRequest {
696- ContentTopics : & [] string { "incorrect-content-topic" },
697- TimeStart : queryTimestamp ,
698- }
689+ Debug("Sender Node1 is publishing a message with a correct content topic")
690+ message := node1.CreateMessage()
691+ msgHash, err := node1.RelayPublishNoCTX(DefaultPubsubTopic, message)
692+ require.NoError(t, err)
693+ require.NotEmpty(t, msgHash)
699694
700- storedmsgs , _ := node3 .GetStoredMessages (node2 , storeQueryRequest )
701- require .Nil (t , (* storedmsgs .Messages )[0 ], "Expected no messages to be returned for incorrect content topic and timestamp" )
702- Debug ("Test successfully verified that store query fails when using an incorrect content topic and an old timestamp" )
703- }
695+ Debug("Querying stored messages from Node3 with an incorrect content topic and an old timestamp")
696+ storeQueryRequest := &common.StoreQueryRequest{
697+ ContentTopics: &[]string{"incorrect-content-topic"},
698+ TimeStart: queryTimestamp,
699+ }
704700
701+ storedmsgs, _ := node3.GetStoredMessages(node2, storeQueryRequest)
702+ require.Nil(t, (*storedmsgs.Messages)[0], "Expected no messages to be returned for incorrect content topic and timestamp")
703+ Debug("Test successfully verified that store query fails when using an incorrect content topic and an old timestamp")
704+ }
705+ */
705706func TestCheckStoredMSGsEphemeralTrue (t * testing.T ) {
706707 Debug ("Starting test to verify ephemeral messages are not stored" )
707708
0 commit comments