Skip to content

Commit

Permalink
@PascalinDe's comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ineiti committed Sep 25, 2023
1 parent 5b6394c commit 8b1299f
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 191 deletions.
1 change: 0 additions & 1 deletion .github/workflows/go_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
branches: [main]

jobs:
if: false
integration:
name: Integration test
runs-on: ubuntu-latest
Expand Down
107 changes: 0 additions & 107 deletions docker-compose/docker-compose.dev.yml

This file was deleted.

14 changes: 2 additions & 12 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
services:

dela-worker-0: # initial DELA leader node
dela-worker-0: # inital DELA leader node
image: ghcr.io/c4dt/d-voting-dela:latest
build:
dockerfile: Dockerfiles/Dockerfile.dela
context: ../
environment:
PROXYKEY: ${PUBLIC_KEY}
PROXYPORT: ${PROXYPORT}
Expand All @@ -16,7 +13,6 @@ services:
networks:
d-voting:
ipv4_address: 172.19.44.254

dela-worker-1: # DELA worker node
image: ghcr.io/c4dt/d-voting-dela:latest
environment:
Expand Down Expand Up @@ -59,9 +55,6 @@ services:

frontend: # web service frontend
image: ghcr.io/c4dt/d-voting-frontend:latest
build:
dockerfile: Dockerfiles/Dockerfile.frontend
context: ../
ports:
- 127.0.0.1:3000:3000
environment:
Expand All @@ -73,9 +66,6 @@ services:

backend: # web service backend
image: ghcr.io/c4dt/d-voting-backend:latest
build:
dockerfile: Dockerfiles/Dockerfile.backend
context: ../
environment:
DATABASE_USERNAME: ${DATABASE_USERNAME}
DATABASE_PASSWORD: ${DATABASE_PASSWORD}
Expand Down Expand Up @@ -105,7 +95,7 @@ services:
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
volumes:
- postgres-data:/var/lib/postgresql/data
- ../web/backend/src/migration.sql:/docker-entrypoint-initdb.d/init.sql
- ./web/backend/src/migration.sql:/docker-entrypoint-initdb.d/init.sql
networks:
d-voting:
ipv4_address: 172.19.44.4
Expand Down
19 changes: 7 additions & 12 deletions scripts/init_dela.sh
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
#!/bin/bash -e
#!/bin/bash

MEMBERS="";
export COMPOSE_FILE=${1:-../docker-compose/docker-compose.dev.yml}
if ! [[ -f ../docker-compose/.env ]]; then
ln -s ../.env ../docker-compose/.env
fi

echo "Share the certificate"

# share the certificate
for container in dela-worker-1 dela-worker-2 dela-worker-3; do
TOKEN_ARGS=$(docker compose exec dela-worker-0 /bin/bash -c 'LLVL=error dvoting --config /data/node minogrpc token');
docker compose exec "$container" dvoting --config /data/node minogrpc join --address //localhost:2000 $TOKEN_ARGS;
docker compose exec "$container" dvoting --config /data/node minogrpc join --address //dela-worker-0:2000 $TOKEN_ARGS;
done

echo "Create a new chain with the nodes"
# create a new chain with the nodes
for container in dela-worker-0 dela-worker-1 dela-worker-2 dela-worker-3; do
# add node to the chain
MEMBERS="$MEMBERS --member $(docker compose exec $container /bin/bash -c 'LLVL=error dvoting --config /data/node ordering export')";
done
docker compose exec dela-worker-0 dvoting --config /data/node ordering setup $MEMBERS;

echo "Authorize the signer to handle the access contract on each node"
# authorize the signer to handle the access contract on each node
for signer in dela-worker-0 dela-worker-1 dela-worker-2 dela-worker-3; do
IDENTITY=$(docker compose exec "$signer" crypto bls signer read --path /data/node/private.key --format BASE64_PUBKEY);
for node in dela-worker-0 dela-worker-1 dela-worker-2 dela-worker-3; do
docker compose exec "$node" dvoting --config /data/node access add --identity "$IDENTITY";
done
done

echo "Update the access contract"
# update the access contract
for container in dela-worker-0 dela-worker-1 dela-worker-2 dela-worker-3; do
IDENTITY=$(docker compose exec "$container" crypto bls signer read --path /data/node/private.key --format BASE64_PUBKEY);
docker compose exec dela-worker-0 dvoting --config /data/node pool add\
Expand All @@ -45,5 +42,3 @@ for container in dela-worker-0 dela-worker-1 dela-worker-2 dela-worker-3; do
--args access:command\
--args GRANT
done

echo "Successfully done"
8 changes: 0 additions & 8 deletions scripts/setup_admin.sh

This file was deleted.

39 changes: 0 additions & 39 deletions scripts/setup_forms.sh

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/setup_proxies.sh

This file was deleted.

File renamed without changes.

0 comments on commit 8b1299f

Please sign in to comment.