chore_: remove wakuv1 and wakuv2 wrappers

status-im · Jan 21, 2025 · 45fc2c6 · 45fc2c6
1 parent 3e0b1b2
commit 45fc2c6
Show file tree

Hide file tree

Showing 54 changed files with 761 additions and 1,141 deletions.
diff --git a/eth-node/bridge/geth/node.go b/eth-node/bridge/geth/node.go
@@ -15,7 +15,6 @@ import (
 	gethnode "github.com/status-im/status-go/eth-node/node"
 	enstypes "github.com/status-im/status-go/eth-node/types/ens"
 
-	wakubridge "github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -50,15 +49,15 @@ func (w *gethNodeWrapper) GetWaku(ctx interface{}) (wakutypes.Waku, error) {
 		return nil, errors.New("waku service is not available")
 	}
 
-	return wakubridge.NewGethWakuWrapper(w.waku1), nil
+	return w.waku1, nil
 }
 
 func (w *gethNodeWrapper) GetWakuV2(ctx interface{}) (wakutypes.Waku, error) {
 	if w.waku2 == nil {
 		return nil, errors.New("waku service is not available")
 	}
 
-	return wakubridge.NewGethWakuV2Wrapper(w.waku2), nil
+	return w.waku2, nil
 }
 
 func (w *gethNodeWrapper) AddPeer(url string) error {

diff --git a/mailserver/mailserver.go b/mailserver/mailserver.go
@@ -35,7 +35,6 @@ import (
 	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/logutils"
 	"github.com/status-im/status-go/params"
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 	"github.com/status-im/status-go/wakuv1"
 	wakuv1common "github.com/status-im/status-go/wakuv1/common"
@@ -126,7 +125,7 @@ func (s *WakuMailServer) Close() {
 }
 
 func (s *WakuMailServer) Archive(env *wakuv1common.Envelope) {
-	s.ms.Archive(bridge.NewWakuEnvelope(env))
+	s.ms.Archive(wakuv1.NewWakuEnvelope(env))
 }
 
 func (s *WakuMailServer) Deliver(peerID []byte, req wakuv1common.MessagesRequest) {

diff --git a/mailserver/mailserver_db_postgres_test.go b/mailserver/mailserver_db_postgres_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/postgres"
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
+	"github.com/status-im/status-go/wakuv1"
 	wakuv1common "github.com/status-im/status-go/wakuv1/common"
 )
 
@@ -126,5 +126,5 @@ func newTestEnvelope(topic []byte) (wakutypes.Envelope, error) {
 	if err != nil {
 		return nil, err
 	}
-	return bridge.NewWakuEnvelope(envelope), nil
+	return wakuv1.NewWakuEnvelope(envelope), nil
 }
diff --git a/protocol/common/message_sender_test.go b/protocol/common/message_sender_test.go
@@ -6,7 +6,6 @@ import (
 
 	transport2 "github.com/status-im/status-go/protocol/transport"
 	"github.com/status-im/status-go/t/helpers"
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 	"github.com/status-im/status-go/wakuv1"
 
@@ -74,7 +73,7 @@ func (s *MessageSenderSuite) SetupTest() {
 	s.Require().NoError(shh.Start())
 
 	whisperTransport, err := transport2.NewTransport(
-		bridge.NewGethWakuWrapper(shh),
+		shh,
 		identity,
 		database,
 		"waku_keys",

diff --git a/protocol/communities_messenger_shared_member_address_test.go b/protocol/communities_messenger_shared_member_address_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/requests"
 	"github.com/status-im/status-go/protocol/tt"
+	"github.com/status-im/status-go/wakuv2"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -89,13 +89,13 @@ func (s *MessengerCommunitiesSharedMemberAddressSuite) TearDownTest() {
 	TearDownMessenger(&s.Suite, s.bob)
 	TearDownMessenger(&s.Suite, s.alice)
 	if s.ownerWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.ownerWaku).Stop())
+		s.Require().NoError(s.ownerWaku.(*wakuv2.Waku).Stop())
 	}
 	if s.bobWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.bobWaku).Stop())
+		s.Require().NoError(s.bobWaku.(*wakuv2.Waku).Stop())
 	}
 	if s.aliceWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.aliceWaku).Stop())
+		s.Require().NoError(s.aliceWaku.(*wakuv2.Waku).Stop())
 	}
 	_ = s.logger.Sync()
 }

diff --git a/protocol/communities_messenger_test_suite_base_test.go b/protocol/communities_messenger_test_suite_base_test.go
@@ -18,7 +18,6 @@ import (
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/wakuv1"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -52,7 +51,7 @@ func (s *CommunitiesMessengerTestSuiteBase) SetupTest() {
 	config := wakuv1.DefaultConfig
 	config.MinimumAcceptedPoW = 0
 	shh := wakuv1.New(&config, s.logger)
-	s.shh = bridge.NewGethWakuWrapper(shh)
+	s.shh = shh
 	s.Require().NoError(shh.Start())
 }
 

diff --git a/protocol/communities_messenger_token_permissions_test.go b/protocol/communities_messenger_token_permissions_test.go
@@ -32,7 +32,6 @@ import (
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/services/wallet/thirdparty"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -200,13 +199,13 @@ func (s *MessengerCommunitiesTokenPermissionsSuite) TearDownTest() {
 	TearDownMessenger(&s.Suite, s.bob)
 	TearDownMessenger(&s.Suite, s.alice)
 	if s.ownerWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.ownerWaku).Stop())
+		s.Require().NoError(s.ownerWaku.Stop())
 	}
 	if s.bobWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.bobWaku).Stop())
+		s.Require().NoError(s.bobWaku.Stop())
 	}
 	if s.aliceWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.aliceWaku).Stop())
+		s.Require().NoError(s.aliceWaku.Stop())
 	}
 	_ = s.logger.Sync()
 }
@@ -494,7 +493,8 @@ func (s *MessengerCommunitiesTokenPermissionsSuite) TestBecomeMemberPermissions(
 	}
 	wakuStoreNode := NewTestWakuV2(&s.Suite, cfg)
 
-	storeNodeListenAddresses := wakuStoreNode.ListenAddresses()
+	storeNodeListenAddresses, err := wakuStoreNode.ListenAddresses()
+	s.Require().NoError(err)
 	s.Require().LessOrEqual(1, len(storeNodeListenAddresses))
 
 	storeNodeAddress := storeNodeListenAddresses[0]

diff --git a/protocol/messenger_base_test.go b/protocol/messenger_base_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/wakuv1"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -25,7 +24,7 @@ func (s *MessengerBaseTestSuite) SetupTest() {
 	config := wakuv1.DefaultConfig
 	config.MinimumAcceptedPoW = 0
 	shh := wakuv1.New(&config, s.logger)
-	s.shh = bridge.NewGethWakuWrapper(shh)
+	s.shh = shh
 	s.Require().NoError(shh.Start())
 
 	s.m = s.newMessenger()

diff --git a/protocol/messenger_communities_sharding_test.go b/protocol/messenger_communities_sharding_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/status-im/status-go/protocol/requests"
 	"github.com/status-im/status-go/protocol/tt"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -98,13 +97,13 @@ func (s *MessengerCommunitiesShardingSuite) TearDownTest() {
 		TearDownMessenger(&s.Suite, s.owner)
 	}
 	if s.ownerWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.ownerWaku).Stop())
+		s.Require().NoError(s.ownerWaku.Stop())
 	}
 	if s.alice != nil {
 		TearDownMessenger(&s.Suite, s.alice)
 	}
 	if s.aliceWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.aliceWaku).Stop())
+		s.Require().NoError(s.aliceWaku.Stop())
 	}
 	_ = s.logger.Sync()
 }

diff --git a/protocol/messenger_delete_message_for_me_test.go b/protocol/messenger_delete_message_for_me_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/wakuv1"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -63,7 +62,7 @@ func (s *MessengerDeleteMessageForMeSuite) SetupTest() {
 	config := wakuv1.DefaultConfig
 	config.MinimumAcceptedPoW = 0
 	shh := wakuv1.New(&config, s.logger)
-	s.shh = bridge.NewGethWakuWrapper(shh)
+	s.shh = shh
 	s.Require().NoError(shh.Start())
 
 	s.alice1 = s.newMessenger()

diff --git a/protocol/messenger_identity_image_test.go b/protocol/messenger_identity_image_test.go
@@ -23,7 +23,6 @@ import (
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/wakuv1"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -50,12 +49,12 @@ func (s *MessengerProfilePictureHandlerSuite) SetupSuite() {
 	config.MinimumAcceptedPoW = 0
 	wakuLogger := s.logger.Named("Waku")
 	shh := wakuv1.New(&config, wakuLogger)
-	s.shh = bridge.NewGethWakuWrapper(shh)
+	s.shh = shh
 	s.Require().NoError(shh.Start())
 }
 
 func (s *MessengerProfilePictureHandlerSuite) TearDownSuite() {
-	_ = bridge.GetGethWakuFrom(s.shh).Stop()
+	_ = s.shh.Stop()
 	_ = s.logger.Sync()
 }
 

diff --git a/protocol/messenger_messages_tracking_test.go b/protocol/messenger_messages_tracking_test.go
@@ -17,7 +17,6 @@ import (
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/signal"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -108,14 +107,14 @@ func (s *MessengerMessagesTrackingSuite) TearDownTest() {
 
 	}
 	if s.bobWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.bobWaku).Stop())
+		s.Require().NoError(s.bobWaku.Stop())
 	}
 
 	if s.alice != nil {
 		TearDownMessenger(&s.Suite, s.alice)
 	}
 	if s.aliceWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.aliceWaku).Stop())
+		s.Require().NoError(s.aliceWaku.Stop())
 	}
 
 	_ = s.logger.Sync()

diff --git a/protocol/messenger_offline_test.go b/protocol/messenger_offline_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/requests"
 	"github.com/status-im/status-go/protocol/tt"
+	"github.com/status-im/status-go/wakuv2"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -84,20 +84,20 @@ func (s *MessengerOfflineSuite) TearDownTest() {
 		s.Require().NoError(s.owner.Shutdown())
 	}
 	if s.ownerWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.ownerWaku).Stop())
+		s.Require().NoError(s.ownerWaku.Stop())
 	}
 
 	if s.bob != nil {
 		s.Require().NoError(s.bob.Shutdown())
 	}
 	if s.bobWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.bobWaku).Stop())
+		s.Require().NoError(s.bobWaku.Stop())
 	}
 	if s.alice != nil {
 		s.Require().NoError(s.alice.Shutdown())
 	}
 	if s.aliceWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.aliceWaku).Stop())
+		s.Require().NoError(s.aliceWaku.Stop())
 	}
 	_ = s.logger.Sync()
 }
@@ -140,7 +140,7 @@ func (s *MessengerOfflineSuite) TestCommunityOfflineEdit() {
 	s.checkMessageDelivery(ctx, inputMessage)
 
 	// Simulate going offline
-	wakuv2 := bridge.GetGethWakuV2From(s.aliceWaku)
+	wakuv2 := s.aliceWaku.(*wakuv2.Waku)
 	wakuv2.SkipPublishToTopic(true)
 
 	resp, err := s.alice.SendChatMessage(ctx, inputMessage)

diff --git a/protocol/messenger_peersyncing_test.go b/protocol/messenger_peersyncing_test.go
@@ -17,7 +17,6 @@ import (
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/wakuv1"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -46,7 +45,7 @@ func (s *MessengerPeersyncingSuite) SetupTest() {
 	config := wakuv1.DefaultConfig
 	config.MinimumAcceptedPoW = 0
 	shh := wakuv1.New(&config, s.logger)
-	s.shh = bridge.NewGethWakuWrapper(shh)
+	s.shh = shh
 	s.Require().NoError(shh.Start())
 
 	s.owner = s.newMessenger()

diff --git a/protocol/messenger_raw_message_resend_test.go b/protocol/messenger_raw_message_resend_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/tt"
 
-	"github.com/status-im/status-go/waku/bridge"
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
 
@@ -77,10 +76,10 @@ func (s *MessengerRawMessageResendTest) TearDownTest() {
 	TearDownMessenger(&s.Suite, s.aliceMessenger)
 	TearDownMessenger(&s.Suite, s.bobMessenger)
 	if s.aliceWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.aliceWaku).Stop())
+		s.Require().NoError(s.aliceWaku.Stop())
 	}
 	if s.bobWaku != nil {
-		s.Require().NoError(bridge.GetGethWakuV2From(s.bobWaku).Stop())
+		s.Require().NoError(s.bobWaku.Stop())
 	}
 	_ = s.logger.Sync()
 }

diff --git a/protocol/messenger_settings_test.go b/protocol/messenger_settings_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	"github.com/status-im/status-go/waku/bridge"
 	"github.com/status-im/status-go/wakuv1"
 
 	"github.com/status-im/status-go/eth-node/crypto"
@@ -31,7 +30,7 @@ func (s *MessengerSettingsSuite) SetupTest() {
 	config := wakuv1.DefaultConfig
 	config.MinimumAcceptedPoW = 0
 	shh := wakuv1.New(&config, s.logger)
-	s.shh = bridge.NewGethWakuWrapper(shh)
+	s.shh = shh
 	s.Require().NoError(shh.Start())
 
 	pk, err := crypto.GenerateKey()