Update code to use new schema

xmtp · May 29, 2024 · 9f35c55 · 9f35c55
1 parent b278dae
commit 9f35c55
Show file tree

Hide file tree

Showing 33 changed files with 1,238 additions and 1,072 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -0,0 +1,18 @@
+with-expecter: true
+packages:
+  github.com/xmtp/xmtp-node-go/pkg/proto/mls/api/v1:
+    config:
+      dir: ./pkg/mocks
+      outpkg: mocks
+    interfaces:
+      MlsApi_SubscribeGroupMessagesServer:
+        config:
+      MlsApi_SubscribeWelcomeMessagesServer:
+        config:
+  github.com/xmtp/xmtp-node-go/pkg/mlsvalidate:
+    config:
+      dir: ./pkg/mocks
+      outpkg: mocks
+    interfaces:
+      MLSValidationService:
+        config:
diff --git a/dev/generate b/dev/generate
@@ -3,8 +3,7 @@ set -e
 
 go generate ./...
 
-mockgen -package api github.com/xmtp/xmtp-node-go/pkg/proto/mls/api/v1 MlsApi_SubscribeGroupMessagesServer,MlsApi_SubscribeWelcomeMessagesServer > pkg/mls/api/v1/mock.gen.go
-mockgen -package mocks -source ./pkg/mlsvalidate/service.go MLSValidationService > pkg/mlsvalidate/mocks/mock.gen.go
+mockery
 rm -rf pkg/proto/**/*.pb.go pkg/proto/**/*.pb.gw.go pkg/proto/**/*.swagger.json
 if ! buf generate https://github.com/xmtp/proto.git#branch=main,subdir=proto; then
     echo "Failed to generate protobuf definitions"

diff --git a/dev/up b/dev/up
@@ -8,7 +8,7 @@ if ! which golangci-lint &>/dev/null; then brew install golangci-lint; fi
 if ! which shellcheck &>/dev/null; then brew install shellcheck; fi
 if ! which protoc &>/dev/null; then brew install protobuf; fi
 if ! which protoc-gen-go &>/dev/null; then go install google.golang.org/protobuf/cmd/protoc-gen-go@latest; fi
-if ! which mockgen &>/dev/null || [ `mockgen --version` != "v0.4.0" ]; then go install go.uber.org/mock/[email protected]; fi
+if ! which mockery &>/dev/null; then brew install mockery; fi
 if ! which protolint &>/dev/null; then go install github.com/yoheimuta/protolint/cmd/protolint@latest; fi
 
 dev/generate

diff --git a/go.mod b/go.mod
@@ -32,7 +32,6 @@ require (
 	github.com/waku-org/go-waku v0.8.0
 	github.com/xmtp/go-msgio v0.2.1-0.20220510223757-25a701b79cd3
 	github.com/yoheimuta/protolint v0.39.0
-	go.uber.org/mock v0.4.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/sync v0.3.0
 	google.golang.org/genproto v0.0.0-20230223222841-637eb2293923
@@ -42,6 +41,7 @@ require (
 )
 
 require (
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect

diff --git a/go.sum b/go.sum
@@ -141,7 +141,8 @@ github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQ
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd/btcec/v2 v2.2.1 h1:xP60mv8fvp+0khmrN0zTdPC3cNm24rfeE6lh2R/Yv3E=
 github.com/btcsuite/btcd/btcec/v2 v2.2.1/go.mod h1:9/CSmJxmuvqzX9Wh2fXMWToLOHhPd11lSPuIupwTkI8=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
@@ -1191,8 +1192,6 @@ go.uber.org/fx v1.20.0 h1:ZMC/pnRvhsthOZh9MZjMq5U8Or3mA9zBSPaLnzs3ihQ=
 go.uber.org/fx v1.20.0/go.mod h1:qCUj0btiR3/JnanEr1TYEePfSw6o/4qYJscgvzQ5Ub0=
 go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
-go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
-go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=

diff --git a/pkg/migrations/mls/20231023050806_init-schema.down.sql b/pkg/migrations/mls/20231023050806_init-schema.down.sql
diff --git a/pkg/migrations/mls/20231023050806_init-schema.up.sql b/pkg/migrations/mls/20231023050806_init-schema.up.sql
diff --git a/pkg/migrations/mls/20240109001927_add-messages.up.sql b/pkg/migrations/mls/20240109001927_add-messages.up.sql
diff --git a/pkg/migrations/mls/20240122230601_add-hpke-key.down.sql b/pkg/migrations/mls/20240122230601_add-hpke-key.down.sql
diff --git a/pkg/migrations/mls/20240122230601_add-hpke-key.up.sql b/pkg/migrations/mls/20240122230601_add-hpke-key.up.sql
diff --git a/pkg/migrations/mls/20240411200242_init-identity.down.sql b/pkg/migrations/mls/20240411200242_init-identity.down.sql
diff --git a/pkg/migrations/mls/20240411200242_init-identity.up.sql b/pkg/migrations/mls/20240411200242_init-identity.up.sql
diff --git a/pkg/migrations/mls/20240425021053_add-inbox-filters.down.sql b/pkg/migrations/mls/20240425021053_add-inbox-filters.down.sql
diff --git a/pkg/migrations/mls/20240425021053_add-inbox-filters.up.sql b/pkg/migrations/mls/20240425021053_add-inbox-filters.up.sql
diff --git a/...0240528175324_wipe-and-init-schema.up.sql → ...tions/mls/20240528181822_wipe-db.down.sql b/...0240528175324_wipe-and-init-schema.up.sql → ...tions/mls/20240528181822_wipe-db.down.sql
diff --git a/pkg/migrations/mls/20240528181822_wipe-db.up.sql b/pkg/migrations/mls/20240528181822_wipe-db.up.sql
@@ -0,0 +1,8 @@
+SET statement_timeout = 0;
+
+--bun:split
+DROP TABLE IF EXISTS installations, group_messages, welcome_messages, inbox_log, address_log;
+
+--bun:split
+DROP TYPE IF EXISTS inbox_filter;
+
diff --git a/.../mls/20240109001927_add-messages.down.sql → ...s/mls/20240528181851_init-schema.down.sql b/.../mls/20240109001927_add-messages.down.sql → ...s/mls/20240528181851_init-schema.down.sql
@@ -1,5 +1,9 @@
 SET statement_timeout = 0;
 
 --bun:split
-DROP TABLE IF EXISTS messages;
 
+SELECT 1
+
+--bun:split
+
+SELECT 2
diff --git a/...40528175324_wipe-and-init-schema.down.sql → ...ons/mls/20240528181851_init-schema.up.sql b/...40528175324_wipe-and-init-schema.down.sql → ...ons/mls/20240528181851_init-schema.up.sql
@@ -1,21 +1,15 @@
 SET statement_timeout = 0;
 
---bun:split
-DROP TABLE IF EXISTS installations, group_messages, welcome_messages, inbox_log, address_log;
-
 --bun:split
 CREATE TABLE installations(
 	id BYTEA PRIMARY KEY,
 	created_at BIGINT NOT NULL,
 	updated_at BIGINT NOT NULL,
-	credential_identity BYTEA NOT NULL,
+	inbox_id BYTEA NOT NULL,
 	key_package BYTEA NOT NULL,
 	expiration BIGINT NOT NULL
 );
 
---bun:split
-CREATE INDEX idx_installations_created_at ON installations(created_at);
-
 --bun:split
 CREATE TABLE group_messages(
 	id BIGSERIAL PRIMARY KEY,
@@ -26,7 +20,7 @@ CREATE TABLE group_messages(
 );
 
 --bun:split
-CREATE INDEX idx_group_messages_group_id_created_at ON group_messages(group_id, created_at);
+CREATE INDEX idx_group_messages_group_id_id ON group_messages(group_id, id);
 
 --bun:split
 CREATE UNIQUE INDEX idx_group_messages_group_id_data_hash ON group_messages(group_id_data_hash);
@@ -42,7 +36,7 @@ CREATE TABLE welcome_messages(
 );
 
 --bun:split
-CREATE INDEX idx_welcome_messages_installation_key_created_at ON welcome_messages(installation_key, created_at);
+CREATE INDEX idx_welcome_messages_installation_key_id ON welcome_messages(installation_key, id);
 
 --bun:split
 CREATE UNIQUE INDEX idx_welcome_messages_group_key_data_hash ON welcome_messages(installation_key_data_hash);