From ebb079e63047bf5383134b885c1f651b2529e6c9 Mon Sep 17 00:00:00 2001
From: Nicholas Molnar <65710+neekolas@users.noreply.github.com>
Date: Fri, 18 Oct 2024 11:15:59 -0700
Subject: [PATCH] Move message api into its own folder

---
 pkg/api/{ => message}/publishWorker.go   | 2 +-
 pkg/api/{ => message}/publish_test.go    | 2 +-
 pkg/api/{ => message}/service.go         | 2 +-
 pkg/api/{ => message}/subscribeWorker.go | 2 +-
 pkg/api/{ => message}/subscribe_test.go  | 6 +++---
 pkg/api/server.go                        | 3 ++-
 pkg/interceptors/client/auth_test.go     | 4 ++--
 7 files changed, 11 insertions(+), 10 deletions(-)
 rename pkg/api/{ => message}/publishWorker.go (99%)
 rename pkg/api/{ => message}/publish_test.go (99%)
 rename pkg/api/{ => message}/service.go (99%)
 rename pkg/api/{ => message}/subscribeWorker.go (99%)
 rename pkg/api/{ => message}/subscribe_test.go (97%)

diff --git a/pkg/api/publishWorker.go b/pkg/api/message/publishWorker.go
similarity index 99%
rename from pkg/api/publishWorker.go
rename to pkg/api/message/publishWorker.go
index 59e4fb43..5c791216 100644
--- a/pkg/api/publishWorker.go
+++ b/pkg/api/message/publishWorker.go
@@ -1,4 +1,4 @@
-package api
+package message
 
 import (
 	"context"
diff --git a/pkg/api/publish_test.go b/pkg/api/message/publish_test.go
similarity index 99%
rename from pkg/api/publish_test.go
rename to pkg/api/message/publish_test.go
index df085642..c5027240 100644
--- a/pkg/api/publish_test.go
+++ b/pkg/api/message/publish_test.go
@@ -1,4 +1,4 @@
-package api_test
+package message_test
 
 import (
 	"context"
diff --git a/pkg/api/service.go b/pkg/api/message/service.go
similarity index 99%
rename from pkg/api/service.go
rename to pkg/api/message/service.go
index 3acb523d..c828dff8 100644
--- a/pkg/api/service.go
+++ b/pkg/api/message/service.go
@@ -1,4 +1,4 @@
-package api
+package message
 
 import (
 	"context"
diff --git a/pkg/api/subscribeWorker.go b/pkg/api/message/subscribeWorker.go
similarity index 99%
rename from pkg/api/subscribeWorker.go
rename to pkg/api/message/subscribeWorker.go
index 9956a3bf..44815339 100644
--- a/pkg/api/subscribeWorker.go
+++ b/pkg/api/message/subscribeWorker.go
@@ -1,4 +1,4 @@
-package api
+package message
 
 import (
 	"context"
diff --git a/pkg/api/subscribe_test.go b/pkg/api/message/subscribe_test.go
similarity index 97%
rename from pkg/api/subscribe_test.go
rename to pkg/api/message/subscribe_test.go
index 9a61b40a..6eef5b58 100644
--- a/pkg/api/subscribe_test.go
+++ b/pkg/api/message/subscribe_test.go
@@ -1,4 +1,4 @@
-package api_test
+package message_test
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/xmtp/xmtpd/pkg/api"
+	"github.com/xmtp/xmtpd/pkg/api/message"
 	"github.com/xmtp/xmtpd/pkg/db"
 	"github.com/xmtp/xmtpd/pkg/db/queries"
 	"github.com/xmtp/xmtpd/pkg/proto/xmtpv4/message_api"
@@ -76,7 +76,7 @@ func insertInitialRows(t *testing.T, store *sql.DB) {
 	testutils.InsertGatewayEnvelopes(t, store, []queries.InsertGatewayEnvelopeParams{
 		allRows[0], allRows[1],
 	})
-	time.Sleep(api.SubscribeWorkerPollTime + 100*time.Millisecond)
+	time.Sleep(message.SubscribeWorkerPollTime + 100*time.Millisecond)
 }
 
 func insertAdditionalRows(t *testing.T, store *sql.DB, notifyChan ...chan bool) {
diff --git a/pkg/api/server.go b/pkg/api/server.go
index cc81ab45..607387f3 100644
--- a/pkg/api/server.go
+++ b/pkg/api/server.go
@@ -12,6 +12,7 @@ import (
 	"google.golang.org/grpc/reflection"
 
 	"github.com/pires/go-proxyproto"
+	"github.com/xmtp/xmtpd/pkg/api/message"
 	"github.com/xmtp/xmtpd/pkg/blockchain"
 	"github.com/xmtp/xmtpd/pkg/proto/xmtpv4/message_api"
 	"github.com/xmtp/xmtpd/pkg/registrant"
@@ -86,7 +87,7 @@ func NewAPIServer(
 	healthcheck := health.NewServer()
 	healthgrpc.RegisterHealthServer(s.grpcServer, healthcheck)
 
-	replicationService, err := NewReplicationApiService(
+	replicationService, err := message.NewReplicationApiService(
 		ctx,
 		log,
 		registrant,
diff --git a/pkg/interceptors/client/auth_test.go b/pkg/interceptors/client/auth_test.go
index 6e2796c4..ed6b86ef 100644
--- a/pkg/interceptors/client/auth_test.go
+++ b/pkg/interceptors/client/auth_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/xmtp/xmtpd/pkg/api"
+	"github.com/xmtp/xmtpd/pkg/api/message"
 	"github.com/xmtp/xmtpd/pkg/authn"
 	"github.com/xmtp/xmtpd/pkg/constants"
 	"github.com/xmtp/xmtpd/pkg/proto/xmtpv4/message_api"
@@ -22,7 +22,7 @@ import (
 // Create a mock implementation of the ReplicationApiServer interface
 // but that embeds `UnimplementedReplicationApiServer` (which mockery won't do for us)
 type mockReplicationApiServer struct {
-	api.Service
+	message.Service
 	expectedToken string
 }