chore_: remove waku api wrappers

status-im · Jan 21, 2025 · f56eb37 · f56eb37
1 parent b2bb680
commit f56eb37
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 147 deletions.
diff --git a/protocol/messenger_waku_wrapper_test.go b/protocol/messenger_waku_wrapper_test.go
@@ -13,24 +13,24 @@ import (
 type testWakuWrapper struct {
 	*bridge.GethWakuWrapper
 
-	publicWakuAPIWrapper *testPublicWakuAPIWrapper
+	api *testPublicWakuAPI
 }
 
 func newTestWaku(w *wakuv1.Waku) wakutypes.Waku {
 	wrapper := bridge.NewGethWakuWrapper(w)
 	return &testWakuWrapper{
-		GethWakuWrapper:      wrapper.(*bridge.GethWakuWrapper),
-		publicWakuAPIWrapper: newTestPublicWakuAPI(wakuv1.NewPublicWakuAPI(w)).(*testPublicWakuAPIWrapper),
+		GethWakuWrapper: wrapper.(*bridge.GethWakuWrapper),
+		api:             newTestPublicWakuAPI(wakuv1.NewPublicWakuAPI(w)),
 	}
 }
 
 func (tw *testWakuWrapper) PublicWakuAPI() wakutypes.PublicWakuAPI {
-	return tw.publicWakuAPIWrapper
+	return tw.api
 }
 
 func (tw *testWakuWrapper) SubscribePostEvents() chan *PostMessageSubscription {
 	subscription := make(chan *PostMessageSubscription, 100)
-	tw.publicWakuAPIWrapper.postSubscriptions = append(tw.publicWakuAPIWrapper.postSubscriptions, subscription)
+	tw.api.postSubscriptions = append(tw.api.postSubscriptions, subscription)
 	return subscription
 }
 
@@ -39,21 +39,20 @@ type PostMessageSubscription struct {
 	msg *wakutypes.NewMessage
 }
 
-type testPublicWakuAPIWrapper struct {
-	*bridge.GethPublicWakuAPIWrapper
+type testPublicWakuAPI struct {
+	*wakuv1.PublicWakuAPI
 
 	postSubscriptions []chan *PostMessageSubscription
 }
 
-func newTestPublicWakuAPI(api *wakuv1.PublicWakuAPI) wakutypes.PublicWakuAPI {
-	wrapper := bridge.NewGethPublicWakuAPIWrapper(api)
-	return &testPublicWakuAPIWrapper{
-		GethPublicWakuAPIWrapper: wrapper.(*bridge.GethPublicWakuAPIWrapper),
+func newTestPublicWakuAPI(api *wakuv1.PublicWakuAPI) *testPublicWakuAPI {
+	return &testPublicWakuAPI{
+		PublicWakuAPI: api,
 	}
 }
 
-func (tp *testPublicWakuAPIWrapper) Post(ctx context.Context, req wakutypes.NewMessage) ([]byte, error) {
-	id, err := tp.GethPublicWakuAPIWrapper.Post(ctx, req)
+func (tp *testPublicWakuAPI) Post(ctx context.Context, req wakutypes.NewMessage) ([]byte, error) {
+	id, err := tp.PublicWakuAPI.Post(ctx, req)
 	if err != nil {
 		return nil, err
 	}

diff --git a/waku/bridge/public_waku_api.go b/waku/bridge/public_waku_api.go
diff --git a/waku/bridge/public_wakuv2_api.go b/waku/bridge/public_wakuv2_api.go
diff --git a/waku/bridge/waku.go b/waku/bridge/waku.go
@@ -43,7 +43,7 @@ func GetGethWakuFrom(m wakutypes.Waku) *wakuv1.Waku {
 }
 
 func (w *GethWakuWrapper) PublicWakuAPI() wakutypes.PublicWakuAPI {
-	return NewGethPublicWakuAPIWrapper(wakuv1.NewPublicWakuAPI(w.waku))
+	return wakuv1.NewPublicWakuAPI(w.waku)
 }
 
 func (w *GethWakuWrapper) Version() uint {

diff --git a/waku/bridge/wakuv2.go b/waku/bridge/wakuv2.go
@@ -44,7 +44,7 @@ func GetGethWakuV2From(m wakutypes.Waku) *wakuv2.Waku {
 }
 
 func (w *gethWakuV2Wrapper) PublicWakuAPI() wakutypes.PublicWakuAPI {
-	return NewGethPublicWakuV2APIWrapper(wakuv2.NewPublicWakuAPI(w.waku))
+	return wakuv2.NewPublicWakuAPI(w.waku)
 }
 
 func (w *gethWakuV2Wrapper) Version() uint {

diff --git a/wakuv1/api.go b/wakuv1/api.go
@@ -29,6 +29,8 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/status-im/status-go/logutils"
+
+	ethtypes "github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/waku/types"
 	"github.com/status-im/status-go/wakuv1/common"
 
@@ -58,6 +60,8 @@ type PublicWakuAPI struct {
 	lastUsed map[string]time.Time // keeps track when a filter was polled for the last time.
 }
 
+var _ types.PublicWakuAPI = (*PublicWakuAPI)(nil)
+
 // NewPublicWakuAPI create a new RPC waku service.
 func NewPublicWakuAPI(w *Waku) *PublicWakuAPI {
 	api := &PublicWakuAPI{
@@ -122,7 +126,7 @@ func (api *PublicWakuAPI) NewKeyPair(ctx context.Context) (string, error) {
 }
 
 // AddPrivateKey imports the given private key.
-func (api *PublicWakuAPI) AddPrivateKey(ctx context.Context, privateKey hexutil.Bytes) (string, error) {
+func (api *PublicWakuAPI) AddPrivateKey(ctx context.Context, privateKey ethtypes.HexBytes) (string, error) {
 	key, err := crypto.ToECDSA(privateKey)
 	if err != nil {
 		return "", err
@@ -212,7 +216,7 @@ func (api *PublicWakuAPI) CancelLightClient(ctx context.Context) bool {
 
 // Post posts a message on the Waku network.
 // returns the hash of the message in case of success.
-func (api *PublicWakuAPI) Post(ctx context.Context, req types.NewMessage) (hexutil.Bytes, error) {
+func (api *PublicWakuAPI) Post(ctx context.Context, req types.NewMessage) ([]byte, error) {
 	var (
 		symKeyGiven = len(req.SymKeyID) > 0
 		pubKeyGiven = len(req.PublicKey) > 0

diff --git a/wakuv2/api.go b/wakuv2/api.go
@@ -31,6 +31,7 @@ import (
 	"github.com/waku-org/go-waku/waku/v2/payload"
 	"github.com/waku-org/go-waku/waku/v2/protocol/pb"
 
+	ethtypes "github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/logutils"
 	"github.com/status-im/status-go/waku/types"
 	"github.com/status-im/status-go/wakuv2/common"
@@ -63,6 +64,8 @@ type PublicWakuAPI struct {
 	lastUsed map[string]time.Time // keeps track when a filter was polled for the last time.
 }
 
+var _ types.PublicWakuAPI = (*PublicWakuAPI)(nil)
+
 // NewPublicWakuAPI create a new RPC waku service.
 func NewPublicWakuAPI(w *Waku) *PublicWakuAPI {
 	api := &PublicWakuAPI{
@@ -95,7 +98,7 @@ func (api *PublicWakuAPI) NewKeyPair(ctx context.Context) (string, error) {
 }
 
 // AddPrivateKey imports the given private key.
-func (api *PublicWakuAPI) AddPrivateKey(ctx context.Context, privateKey hexutil.Bytes) (string, error) {
+func (api *PublicWakuAPI) AddPrivateKey(ctx context.Context, privateKey ethtypes.HexBytes) (string, error) {
 	key, err := crypto.ToECDSA(privateKey)
 	if err != nil {
 		return "", err
@@ -176,7 +179,7 @@ func (api *PublicWakuAPI) BloomFilter() []byte {
 
 // Post posts a message on the Waku network.
 // returns the hash of the message in case of success.
-func (api *PublicWakuAPI) Post(ctx context.Context, req types.NewMessage) (hexutil.Bytes, error) {
+func (api *PublicWakuAPI) Post(ctx context.Context, req types.NewMessage) ([]byte, error) {
 	var (
 		symKeyGiven = len(req.SymKeyID) > 0
 		pubKeyGiven = len(req.PublicKey) > 0