fix: move and fix compose files

compose/docker-compose.dev.yml

@@ -0,0 +1,37 @@
+version: "3"
+
+services:
+  testnet:
+    build:
+      context: ../packages/contracts/
+      dockerfile: ../../dockerfiles/Contract.dockerfile
+    ports:
+      - "5000:5000"
+    command: ganache-cli --db=/data -i 20200406 -p 5000 --deterministic --host 0.0.0.0
+  coordinator:
+    build:
+      context: ../
+      dockerfile: ./dockerfiles/Coordinator.dockerfile
+    ports:
+      - "8888:8888"
+    links:
+      - 'testnet:testnet'
+    depends_on:
+      - 'testnet'
+    volumes:
+      - '../packages:/proj/packages'
+    command: 'node /proj/packages/cli/dist/apps/coordinator/cli.js --ws ws://testnet:5000 --config /proj/packages/cli/coordinator.dev.json'
+  wallet:
+    build:
+      context: ../
+      dockerfile: ./dockerfiles/Cli.dockerfile
+    ports:
+      - "4321:4321"
+    links:
+      - 'testnet:testnet'
+      - 'coordinator:coordinator'
+    depends_on:
+      - 'testnet'
+    volumes:
+      - '../packages:/proj/packages'
+    command: sh -c "sleep 5s && gotty -w --port 4321 node /proj/packages/cli/dist/apps/wallet/cli.js --config /proj/packages/cli/wallet.dev.json" 

compose/docker-compose.instant-block.yml

@@ -7,26 +7,7 @@ services:
     build:
       context: ./packages/contracts/
       dockerfile: ../../dockerfiles/Contract.dockerfile
-    command: ganache-cli --db=/data -i 20200406 -p 5000 --deterministic --host 0.0.0.0 --secure
-  postgres:
-    ports:
-      - "5678:5432"
-    build:
-      context: ./
-      dockerfile: ./dockerfiles/Postgres.dockerfile
-    environment:
-      POSTGRES_PASSWORD: helloworld
-  postgres-setup:
-    build:
-      context: ./
-      dockerfile: ./dockerfiles/PostgresSetup.dockerfile
-    depends_on:
-      - 'postgres'
-    links:
-      - 'postgres:postgres'
-    environment:
-      POSTGRES_URL: postgresql://postgres:helloworld@postgres:5432/zkopru
-    command: prisma migrate up --experimental --schema /proj/prisma/postgres-migrator.prisma --verbose
+    command: ganache-cli --db=/data -i 20200406 -p 5000 --deterministic --host 0.0.0.0 
   coordinator:
     build:
       context: ./
@@ -36,10 +17,8 @@ services:
       - "8888:8888"
     links:
       - 'testnet:testnet'
-      - 'postgres:postgres'
     depends_on:
       - 'testnet'
-      - 'postgres-setup'
     command: sh -c "sleep 5s && gotty -w --port 1234 node /proj/packages/cli/dist/apps/coordinator/cli.js --config /proj/packages/cli/coordinator.dev.json"
   wallet:
     build:
@@ -49,9 +28,7 @@ services:
       - "4321:4321"
     links:
       - 'testnet:testnet'
-      - 'postgres:postgres'
       - 'coordinator:coordinator'
     depends_on:
       - 'testnet'
-      - 'postgres-setup'
     command: sh -c "sleep 5s && gotty -w --port 4321 node /proj/packages/cli/dist/apps/wallet/cli.js --config /proj/packages/cli/wallet.dev.json"

docker-compose.dev.yml

@@ -1,46 +0,0 @@
-version: "3"
-
-services:
-  testnet:
-    ports:
-      - "5000:5000"
-    build:
-      context: ./packages/contracts/
-      dockerfile: ../../dockerfiles/Contract.dockerfile
-    command: ganache-cli --db=/data -i 20200406 -p 5000 --gasLimit 12000000 --deterministic --host 0.0.0.0 --secure --blockTime 10
-  postgres:
-    ports:
-      - "5678:5432"
-    build:
-      context: ./
-      dockerfile: ./dockerfiles/Postgres.dockerfile
-    environment:
-      POSTGRES_PASSWORD: helloworld
-      POSTGRES_URL: postgresql://postgres:helloworld@localhost:5432/zkopru
-      POSTGRES_DB: zkopru
-  coordinator:
-    build:
-      context: ./
-      dockerfile: ./dockerfiles/Cli.dockerfile
-    ports:
-      - "1234:1234"
-      - "8888:8888"
-    depends_on:
-      - 'testnet'
-      - 'postgres'
-    environment:
-      PORT: 1234
-      POSTGRES_URL: postgresql://postgres:helloworld@postgres:5432/zkopru
-  wallet:
-    build:
-      context: ./
-      dockerfile: ./dockerfiles/Cli.dockerfile
-    ports:
-      - "4321:4321"
-    depends_on:
-      - 'testnet'
-      - 'postgres'
-    environment:
-      PORT: 4321
-      SKIP_MIGRATE: 1
-      POSTGRES_URL: postgresql://postgres:helloworld@postgres:5432/zkopru

docker-compose.yml

@@ -7,7 +7,7 @@ services:
       dockerfile: ../../dockerfiles/Contract.dockerfile
     ports:
       - "5000:5000"
-    command: ganache-cli --db=/data -i 20200406 -p 5000 --deterministic --host 0.0.0.0
+    command: ganache-cli --db=/data -i 20200406 -p 5000 --deterministic --host 0.0.0.0 --blockTime 13
   coordinator:
     build:
       context: ./