revert e2e test to sqlite

Author: louisinger

docker-compose.regtest.yml

@@ -1,15 +1,4 @@
 services:
-  ark-db-pg:
-    container_name: ark-db-pg
-    image: postgres
-    restart: unless-stopped
-    ports:
-      - "5432:5432"
-    environment:
-      POSTGRES_USER: root
-      POSTGRES_PASSWORD: secret
-      POSTGRES_DB: ark-db
-
   arkd-wallet:
     build:
       context: .
@@ -34,7 +23,6 @@ services:
     restart: unless-stopped
     depends_on:
       - arkd-wallet
-      - ark-db-pg
     ports:
       - "7070:7070"
     environment:
@@ -48,8 +36,8 @@ services:
       - ARK_DATADIR=./data/regtest
       - ARK_WALLET_ADDR=arkd-wallet:6060
       - ARK_ESPLORA_URL=http://chopsticks:3000
-      - ARK_DB_URL=postgresql://root:secret@ark-db-pg:5432/ark-db?sslmode=disable
-      - ARK_EVENT_DB_URL=postgresql://root:secret@ark-db-pg:5432/ark-event-db?sslmode=disable
+      - ARK_DB_TYPE=sqlite
+      - ARK_EVENT_DB_TYPE=badger
       - ARK_VTXO_MIN_AMOUNT=1
     volumes:
       - type: tmpfs

server/Makefile

@@ -70,11 +70,11 @@ sqlc:
 #### Postgres database ####
 # pg: starts postgres db inside docker container
 pg:
-	@docker run --name ark-pg -p 5432:5432 -e POSTGRES_USER=root -e POSTGRES_PASSWORD=secret -e POSTGRES_DB=ark-db -d postgres
+	@docker run --name ark-pg -v ./scripts:/docker-entrypoint-initdb.d:ro -p 5432:5432 -e POSTGRES_USER=root -e POSTGRES_PASSWORD=secret -e POSTGRES_DB=event -d postgres 
 
 # pgtest: starts postgres db inside docker container
 pgtest:
-	@docker run --name ark-pg-test -p 5432:5432 -e POSTGRES_USER=root -e POSTGRES_PASSWORD=secret -e POSTGRES_DB=ark-db-test -d postgres
+	@docker run --name ark-pg-test -v ./scripts:/docker-entrypoint-initdb.d:ro -p 5432:5432 -e POSTGRES_USER=root -e POSTGRES_PASSWORD=secret -e POSTGRES_DB=event -d postgres 
 
 # droppg: stop and remove postgres container
 droppg:
@@ -86,47 +86,15 @@ droppgtest:
 	@docker stop ark-pg-test
 	@docker rm ark-pg-test
 
-# createdb: create db inside docker container
-createdb:
-	@docker exec ark-pg createdb --username=root --owner=root ark-db
-	@docker exec ark-pg createdb --username=root --owner=root ark-event-db
-
-# dropdb: drops db inside docker container
-dropdb:
-	@docker exec ark-pg dropdb ark-db
-	@docker exec ark-pg dropdb ark-event-db
-
-# createtestdb: create test db inside docker container
-createtestdb:
-	@docker exec ark-pg-test createdb --username=root --owner=root ark-db-test
-	@docker exec ark-pg-test createdb --username=root --owner=root ark-event-db-test
-
-# droptestdb: drops test db inside docker container
-droptestdb:
-	@docker exec ark-pg-test dropdb ark-db-test
-	@docker exec ark-pg-test dropdb ark-event-db-test
-
-# recreatetestdb: drops and creates test db
-recreatetestdb: droptestdb createtestdb
-
 # psql: connects to postgres terminal running inside docker container
 psql:
-	@docker exec -it ark-pg psql -U root -d ark-db -c "SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname NOT IN ('pg_catalog', 'information_schema');" \
-	&& docker exec -it ark-pg psql -U root -d ark-db
+	@docker exec -it ark-pg psql -U root -d event -c "SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname NOT IN ('pg_catalog', 'information_schema');" \
+	&& docker exec -it ark-pg psql -U root -d projection
 
 # pgmigrate: creates pg migration file (e.g. make FILE=init pgmigrate)
 pgmigrate:
 	@docker run --rm -v /internal/infrastructure/db/postgres/migration:/migration migrate/migrate create -ext sql -dir /migration $(FILE)
 
-# pgmigrate-up: applies all Postgres migrations to the running ark-pg container
-pgmigrate-up: dropdb createdb
-	@docker run --rm \
-	  -v $(PWD)/internal/infrastructure/db/postgres/migration:/migrations \
-	  --network host \
-	  migrate/migrate \
-	  -path=/migrations \
-	  -database "postgres://root:secret@localhost:5432/ark-db?sslmode=disable" up
-
 # pgsqlc: generate sql code for postgres
 pgsqlc:
 	@docker run --rm -v $(PWD)/internal/infrastructure/db/postgres:/src -w /src sqlc/sqlc generate

server/envs/regtest.env

@@ -6,4 +6,5 @@ ARK_BOARDING_EXIT_DELAY=604672
 ARK_DATADIR=./data/regtest
 ARK_ESPLORA_URL=http://localhost:3000
 ARK_WALLET_ADDR=localhost:6060
-ARK_DB_URL=postgresql://root:[email protected]:5432/ark-db?sslmode=disable
+ARK_DB_URL=postgresql://root:[email protected]:5432/projection?sslmode=disable
+ARK_EVENT_DB_URL=postgresql://root:[email protected]:5432/event?sslmode=disable

server/internal/infrastructure/db/postgres/event_repo.go

@@ -5,7 +5,6 @@ import (
 
 	"database/sql"
 
-	"github.com/ThreeDotsLabs/watermill"
 	watermillSQL "github.com/ThreeDotsLabs/watermill-sql/v3/pkg/sql"
 	"github.com/ark-network/ark/server/internal/core/domain"
 	watermilldb "github.com/ark-network/ark/server/internal/infrastructure/db/watermill"
@@ -26,7 +25,7 @@ func NewEventRepository(config ...interface{}) (domain.EventRepository, error) {
 			SchemaAdapter:        watermillSQL.DefaultPostgreSQLSchema{},
 			AutoInitializeSchema: true,
 		},
-		watermill.NewStdLogger(false, false),
+		nil,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("cannot open event repository: %w", err)

server/internal/infrastructure/db/service_test.go

@@ -135,8 +135,8 @@ func TestMain(m *testing.M) {
 
 func TestService(t *testing.T) {
 	dbDir := t.TempDir()
-	pgDns := "postgresql://root:[email protected]:5432/ark-db-test?sslmode=disable"
-	pgEventDns := "postgresql://root:[email protected]:5432/ark-event-db-test?sslmode=disable"
+	pgDns := "postgresql://root:[email protected]:5432/projection?sslmode=disable"
+	pgEventDns := "postgresql://root:[email protected]:5432/event?sslmode=disable"
 	tests := []struct {
 		name   string
 		config db.ServiceConfig

server/scripts/01-db-init.sql

@@ -0,0 +1 @@
+CREATE DATABASE projection;