Fix failing tests

xmtp · May 29, 2024 · e3bee27 · e3bee27
1 parent eb80645
commit e3bee27
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/pkg/identity/api/v1/identity_service_test.go b/pkg/identity/api/v1/identity_service_test.go
@@ -152,7 +152,7 @@ func TestPublishedUpdatesCanBeRead(t *testing.T) {
 	svc, _, cleanup := newTestService(t, ctx)
 	defer cleanup()
 
-	inbox_id := "test_inbox"
+	inbox_id := test.RandomInboxId()
 	address := "test_address"
 
 	_, err := svc.PublishIdentityUpdate(ctx, publishIdentityUpdateRequest(inbox_id, makeCreateInbox(address)))
@@ -173,7 +173,7 @@ func TestPublishedUpdatesAreInOrder(t *testing.T) {
 	svc, _, cleanup := newTestService(t, ctx)
 	defer cleanup()
 
-	inbox_id := "test_inbox"
+	inbox_id := test.RandomInboxId()
 	address := "test_address"
 
 	_, err := svc.PublishIdentityUpdate(ctx, publishIdentityUpdateRequest(inbox_id, makeCreateInbox(address)))
@@ -210,10 +210,10 @@ func TestQueryMultipleInboxes(t *testing.T) {
 	svc, _, cleanup := newTestService(t, ctx)
 	defer cleanup()
 
-	first_inbox_id := "test_inbox"
-	second_inbox_id := "second_inbox"
-	first_address := "test_address"
-	second_address := "test_address"
+	first_inbox_id := test.RandomInboxId()
+	second_inbox_id := test.RandomInboxId()
+	first_address := test.RandomInboxId()
+	second_address := test.RandomInboxId()
 
 	_, err := svc.PublishIdentityUpdate(ctx, publishIdentityUpdateRequest(first_inbox_id, makeCreateInbox(first_address)))
 	require.NoError(t, err)
@@ -233,7 +233,7 @@ func TestInboxSizeLimit(t *testing.T) {
 	svc, _, cleanup := newTestService(t, ctx)
 	defer cleanup()
 
-	inbox_id := "test_inbox"
+	inbox_id := test.RandomInboxId()
 	address := "test_address"
 
 	_, err := svc.PublishIdentityUpdate(ctx, publishIdentityUpdateRequest(inbox_id, makeCreateInbox(address)))

diff --git a/pkg/migrations/mls/20240528181851_init-schema.up.sql b/pkg/migrations/mls/20240528181851_init-schema.up.sql
@@ -65,7 +65,7 @@ CREATE INDEX idx_address_log_address_inbox_id ON address_log(address, inbox_id);
 
 --bun:split
 CREATE TYPE inbox_filter AS (
-	inbox_id BYTEA,
+	inbox_id TEXT, -- Because this is serialized as JSON, we can't use a BYTEA type
 	sequence_id BIGINT
 );
 
diff --git a/pkg/mls/store/queries.sql b/pkg/mls/store/queries.sql
@@ -22,7 +22,7 @@ FROM
 			*
 		FROM
 			json_populate_recordset(NULL::inbox_filter, @filters) AS b(inbox_id,
-				sequence_id)) AS b ON b.inbox_id = a.inbox_id
+				sequence_id)) AS b ON decode(b.inbox_id, 'hex') = a.inbox_id::BYTEA
 		AND a.sequence_id > b.sequence_id
 	ORDER BY
 		a.sequence_id ASC;

diff --git a/pkg/mls/store/queries/queries.sql.go b/pkg/mls/store/queries/queries.sql.go
diff --git a/pkg/mls/store/store.go b/pkg/mls/store/store.go
@@ -201,12 +201,14 @@ func (s *Store) GetInboxLogs(ctx context.Context, batched_req *identity.GetIdent
 
 	filters := make(queries.InboxLogFilterList, len(reqs))
 	for i, req := range reqs {
+		s.log.Info("Filtering for inbox_id", zap.Any("inbox_id", req.InboxId))
 		filters[i] = queries.InboxLogFilter{
 			InboxId:    req.InboxId,
 			SequenceId: int64(req.SequenceId),
 		}
 	}
 	filterBytes, err := filters.ToSql()
+	s.log.Info("Filter bytes", zap.Any("filter_bytes", filterBytes))
 	if err != nil {
 		return nil, err
 	}