Tidy up tests and logfiles

package.json

@@ -13,7 +13,7 @@
     "lint": "yarn evm:lint",
     "typechain": "yarn evm:typechain",
     "test": "yarn evm:test && yarn ciphernode:test",
-    "test:integration": "./tests/basic_integration/test.sh",
+    "test:integration": "./tests/integration/test.sh",
     "coverage": "yarn evm:coverage",
     "enclave": "cd packages/ciphernode && ./scripts/launch.sh",
     "ciphernode:lint": "cd packages/ciphernode && cargo fmt -- --check",

tests/basic_integration/fns.sh → tests/integration/fns.sh

@@ -56,6 +56,10 @@ heading() {
     echo ""
 }
 
+strip_ansi() {
+    sed 's/\x1b\[[0-9;]*m//g'
+}
+
 waiton() {
     local file_path="$1"
     until [ -f "$file_path" ]; do
@@ -102,7 +106,7 @@ launch_ciphernode() {
    mkdir -p "$log_dir"
    $ENCLAVE_BIN start -v \
      --tag "$name" \
-     --config "$SCRIPT_DIR/lib/$name/config.yaml" 2>&1 | tee "$log_file" & echo $! > "/tmp/enclave.${ID}_${name}.pid"
+     --config "$SCRIPT_DIR/lib/$name/config.yaml" 2>&1 | tee >(strip_ansi > "$log_file") & echo $! > "/tmp/enclave.${ID}_${name}.pid"
 }
 
 set_private_key() {
@@ -136,7 +140,7 @@ launch_aggregator() {
      --tag "$name" \
      --config "$SCRIPT_DIR/lib/$name/config.yaml" \
      --pubkey-write-path "$SCRIPT_DIR/output/pubkey.bin" \
-     --plaintext-write-path "$SCRIPT_DIR/output/plaintext.txt" 2>&1 | tee "$log_file" & echo $! > "/tmp/enclave.${ID}_${name}.pid"
+     --plaintext-write-path "$SCRIPT_DIR/output/plaintext.txt" 2>&1 | tee >(strip_ansi > "$log_file") & echo $! > "/tmp/enclave.${ID}_${name}.pid"
 }
 
 kill_proc() {

tests/integration/lib/pack_e3_params.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+./packages/ciphernode/target/debug/pack_e3_params "$@" 

tests/basic_integration/lib/prebuild.sh → tests/integration/lib/prebuild.sh

@@ -1,3 +1,8 @@
 #!/usr/bin/env sh
-
+echo ""
+echo "PREBUILDING BINARIES..."
+echo ""
 cd packages/ciphernode && cargo build --bin fake_encrypt --bin enclave --bin pack_e3_params;
+echo ""
+echo "FINISHED PREBUILDING BINARIES"
+echo ""