diff --git a/basice2e/gateway-6.yaml b/basice2e/gateway-6.yaml
deleted file mode 100644
index 1142400ee090fd49aff8a66832b3aa2c84d8798d..0000000000000000000000000000000000000000
--- a/basice2e/gateway-6.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# START YAML ===
-################################################################################
-## Copyright © 2019 Privategrity Corporation #
-## #
-## All rights reserved. #
-################################################################################
-
-# Output log file
-log: "results/gateways/gatway-6.log"
-
-# Log message level
-logLevel: 1
-
-# The cMix nodes in the network
-cMixNodes:
- - "localhost:50000"
- - "localhost:50001"
- - "localhost:50002"
- - "localhost:50003"
- - "localhost:50004"
- - "localhost:50005"
-
-# The listening address of this gateway
-Port: 8445
-
-# The number of seconds a message should remain in the globals before being
-# deleted from the user's message queue
-MessageTimeout: 1800
-
-# === REQUIRED FOR ENABLING TLS ===
-# Path to the private key file
-keyPath: "../keys/cmix.rip.key"
-# Path to the certificate file
-certPath: "../keys/cmix.rip.crt"
-# Path to the certificate file
-serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
-
-### Anything below this line is to be deprecated ###
-
-# Batch size of the cMix Network (to be deprecated)
-batchSize: 4
-
-groups:
- cmix:
- prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
- smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
- generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-
-# === END YAML
diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml
index ccdcaeadeb54c47255eff7e4de4be4de47f6d1a4..0c111dc9c8f85698f4eaba10c8b2089bfca4f151 100644
--- a/basice2e/permissioning.yaml
+++ b/basice2e/permissioning.yaml
@@ -19,7 +19,7 @@ dbPassword: ""
dbName: ""
dbAddress: ""
-minimumNodes: 6
+minimumNodes: 5
# List of Node registration codes (in order of network placement)
registrationCodes:
diff --git a/basice2e/regCodes.json b/basice2e/regCodes.json
index 94b1e75b8aa7e6efe5217c1e6742791e50854477..e491b421986134e50cae3449f25442508dacf9eb 100644
--- a/basice2e/regCodes.json
+++ b/basice2e/regCodes.json
@@ -1 +1 @@
-[{"RegCode": "qpol", "Order": "0"},{"RegCode": "yiiq", "Order": "1"},{"RegCode": "vydz", "Order": "2"},{"RegCode": "gwxs", "Order": "3"},{"RegCode": "nahv", "Order": "4"},{"RegCode": "plmd", "Order": "5"},{"RegCode": "hhkz", "Order": "6"},{"RegCode": "xdzt", "Order": "7"},{"RegCode": "lpzx", "Order": "8"}]
\ No newline at end of file
+[{"RegCode": "qpol", "Order": "0"},{"RegCode": "yiiq", "Order": "1"},{"RegCode": "vydz", "Order": "2"},{"RegCode": "gwxs", "Order": "3"},{"RegCode": "nahv", "Order": "4"}]
diff --git a/basice2e/registration.json b/basice2e/registration.json
index ab8f909464050911da7a13742ebcab5ac493ce52..3d9c19080cba8b87452897b3f4901ea5c9d1309f 100644
--- a/basice2e/registration.json
+++ b/basice2e/registration.json
@@ -1,6 +1,6 @@
{
- "TeamSize": 3,
+ "TeamSize": 5,
"BatchSize": 100,
"RandomOrdering": true,
"MinimumDelay": 50
- }
\ No newline at end of file
+ }
diff --git a/basice2e/rid.txt b/basice2e/rid.txt
index c0f9f71bd94e7c9225f0741b89c394d510c8d595..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/basice2e/rid.txt
+++ b/basice2e/rid.txt
@@ -1 +0,0 @@
-INFO 2020/04/28 09:35:06 [ynnf4kZ5OA/UcJwizZzYm+F/6M4E934M2x9sHHlB7rI=:50004]: RID 0 ReceiveFinishRealtime END
diff --git a/basice2e/run.sh b/basice2e/run.sh
index ae7f4b1d09b1aa605019a981ece6970d44f1aacf..65ccacae2165226d9118d3378271f9359b98bd28 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -33,22 +33,26 @@ echo "$UDBCMD -- $PIDVAL"
echo "STARTING SERVERS..."
+export GRPC_GO_LOG_VERBOSITY_LEVEL=99
+export GRPC_GO_LOG_SEVERITY_LEVEL=info
+rm -f ../keys/cmix.rip.crt-definitio
+
PERMCMD="../bin/permissioning -c permissioning.yaml "
$PERMCMD > $SERVERLOGS/permissioning.log 2>&1 &
PIDVAL=$!
echo "$PERMCMD -- $PIDVAL"
-for SERVERID in $(seq 6 -1 1)
+for SERVERID in $(seq 5 -1 1)
do
IDX=$(($SERVERID - 1))
- SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
+ SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
$SERVERCMD > $SERVERLOGS/server-$SERVERID-console.txt 2>&1 &
PIDVAL=$!
echo "$SERVERCMD -- $PIDVAL"
done
# Start gateways
-for GWID in $(seq 6 -1 1)
+for GWID in $(seq 5 -1 1)
do
IDX=$(($GWID - 1))
GATEWAYCMD="../bin/gateway -i $IDX --config gateway-$GWID.yaml"
diff --git a/basice2e/server-6.yaml b/basice2e/server-6.yaml
deleted file mode 100644
index 9ffc028d9557de06efff4eef5ee1d7f47452a9e0..0000000000000000000000000000000000000000
--- a/basice2e/server-6.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-# START YAML ===
-batch: 32
-verbose: false
-node:
- id: ""
- paths:
- cert: "../keys/cmix.rip.crt"
- key: "../keys/cmix.rip.key"
- log: "results/servers/server-6.log"
- addresses:
- - "localhost:50000"
- - "localhost:50001"
- - "localhost:50002"
- - "localhost:50003"
- - "localhost:50004"
- - "localhost:50005"
-
-database:
- name: "cmix_server"
- username: "cmix"
- password: ""
- addresses:
- - ""
- - ""
- - ""
- - ""
- - ""
- - ""
- - ""
- - ""
- - ""
-gateways:
- paths:
- cert: "../keys/cmix.rip.crt"
- addresses:
- - "0.0.0.0:8200"
- - "0.0.0.0:8201"
- - "0.0.0.0:8202"
- - "0.0.0.0:8203"
- - "0.0.0.0:8204"
- - "0.0.0.0:8205"
- - "0.0.0.0:8206"
- - "0.0.0.0:8207"
- - "0.0.0.0:8208"
-permissioning:
- paths:
- cert: "../keys/cmix.rip.crt"
- address: "localhost:18000"
- registrationCode: "plmd"
-groups:
- cmix:
- prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
- smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
- generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
- e2e:
- prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
- smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
- generator: "2"
-
-metrics:
- log: "metrics-server-5.log"
-# === END YAML