Merge pull request #161 from c4dt/update_scripts

Updating scripts

scripts/README.md

@@ -1,6 +1,7 @@
 # Scripts for running D-voting locally
 
-The following scripts are available to configure and run D-voting locally. They should be called in this order:
+The following scripts are available to configure and run D-voting locally. 
+They should be called in this order:
 
 - `run_local.sh` - sets up a complete system with 4 nodes, the db, the authentication-server,
   and the frontend.
@@ -10,8 +11,14 @@ The following scripts are available to configure and run D-voting locally. They
   For debugging Dela, you still need to re-run everything.
 - `local_proxies.sh` needs to be run once after the `run_local.sh` script
 - `local_forms.sh` creates a new form and prints its ID
-- `local_votes.sh` casts the given number of votes. THE ENCRYPTION IS WRONG AND WILL NOT WORK. But it allows to test
-  missing votes
+
+Every script must be called from the root of the repository:
+
+```bash
+./scripts/run_local.sh
+./scripts/local_proxies.sh
+./scripts/local_forms.sh
+```
 
 The following script is only called by the other scripts:
 

scripts/local_forms.sh

@@ -4,7 +4,8 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 . "$SCRIPT_DIR/local_login.sh"
 
 echo "add form"
-RESP=$(curl -sk "$FRONTEND_URL/api/evoting/forms" -X POST -H 'Content-Type: application/json' -b cookies.txt --data-raw '{"Title":{"En":"Something","Fr":"","De":""},"Scaffold":[{"ID":"99hYV4uy","Title":{"En":"More stuff","Fr":"","De":""},"Order":["0c7RSRKs"],"Ranks":[],"Selects":[{"ID":"0c7RSRKs","Title":{"En":"Choose","Fr":"","De":""},"MaxN":3,"MinN":1,"Choices":[{"Choice":"{\"en\":\"First\"}","URL":""},{"Choice":"{\"en\":\"Second\"}","URL":""},{"Choice":"{\"en\":\"Third\"}","URL":""}],"Hint":{"En":"","Fr":"","De":""}}],"Texts":[],"Subjects":[]}]}')
+FORMJSON='{"Configuration":{"Title":{"En":"title","Fr":"","De":"","URL":""},"Scaffold":[{"ID":"ozCI7gKv","Title":{"En":"subtitle","Fr":"","De":"","URL":""},"Order":["nVjQ0jMK"],"Ranks":[],"Selects":[{"ID":"nVjQ0jMK","Title":{"En":"vote","Fr":"","De":"","URL":""},"MaxN":3,"MinN":1,"Choices":[{"Choice":"{\"en\":\"one\"}","URL":""},{"Choice":"{\"en\":\"two\"}","URL":""},{"Choice":"{\"en\":\"three\"}","URL":""}],"Hint":{"En":"","Fr":"","De":""}}],"Texts":[],"Subjects":[]}],"AdditionalInfo":""}}'
+RESP=$(curl -sk "$FRONTEND_URL/api/evoting/forms" -X POST -H 'Content-Type: application/json' -b cookies.txt --data-raw "$FORMJSON")
 FORMID=$(echo "$RESP" | jq -r .FormID)
 echo "FORMID=$FORMID" > "$SCRIPT_DIR/formid.env"
 

scripts/run_local.sh

@@ -94,13 +94,6 @@ function init_nodes() {
 
 function init_dela() {
   echo "Initializing dela"
-  echo "  Share the certificate"
-  for n in $(seq 2 4); do
-    TOKEN_ARGS=$(dvoting --config ./nodes/node-1 minogrpc token)
-    NODEDIR=./nodes/node-$n
-    dvoting --config $NODEDIR minogrpc join --address grpc://localhost:2000 $TOKEN_ARGS
-  done
-
   echo "  Create a new chain with the nodes"
   for n in $(seq 4); do
     NODEDIR=./nodes/node-$n