From 8144d223596aa96f15059a2e74d47b1de7499094 Mon Sep 17 00:00:00 2001 From: Pouneh Aghababazadeh Date: Wed, 8 Feb 2023 11:39:29 -0800 Subject: [PATCH 1/5] Fix alternative sigstruct source --- tools/build-fs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-fs.sh b/tools/build-fs.sh index 1b19052f5..3255be10c 100755 --- a/tools/build-fs.sh +++ b/tools/build-fs.sh @@ -90,7 +90,7 @@ case ${net} in if test -f "${WORK_DIR}/consensus-enclave.css"; then CONSENSUS_ENCLAVE_CSS="${WORK_DIR}/consensus-enclave.css" else - CONSENSUS_ENCLAVE_CSS=`pwd`/target/docker/release/consensus-enclave.css + CONSENSUS_ENCLAVE_CSS=`pwd`/mobilecoin/target/docker/release/consensus-enclave.css fi ;; *) From fb99dde5ce0b5101f74dd9679fbe66e83f680166 Mon Sep 17 00:00:00 2001 From: Pouneh Aghababazadeh Date: Wed, 8 Feb 2023 11:41:19 -0800 Subject: [PATCH 2/5] Early exit on test script if missing consensus enclave --- tools/test.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/test.sh b/tools/test.sh index 990409d07..f1dd082a5 100755 --- a/tools/test.sh +++ b/tools/test.sh @@ -4,6 +4,11 @@ # RUSTFLAGS="-C instrument-coverage" \ +if ! [[ -f "$(pwd)/consensus-enclave.css" ]]; then + echo "Please copy the consensus enclave to $(pwd)" + exit 1 +fi + echo "Testing in $PWD" SGX_MODE=SW IAS_MODE=DEV CONSENSUS_ENCLAVE_CSS=$(pwd)/consensus-enclave.css \ cargo test $1 From 01b962734b533109a88def34cb33fff034c414b1 Mon Sep 17 00:00:00 2001 From: Pouneh Aghababazadeh Date: Wed, 8 Feb 2023 11:43:21 -0800 Subject: [PATCH 3/5] Change the tx_source_url when running full-service against a local network since the localhost/port doesn't seem to actually have what we expect --- tools/run-fs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run-fs.sh b/tools/run-fs.sh index 02b48996c..91412f81a 100755 --- a/tools/run-fs.sh +++ b/tools/run-fs.sh @@ -130,7 +130,7 @@ case "${net}" in if [[ -z "${offline}" ]] then MC_PEER="insecure-mc://localhost:3200/,insecure-mc://localhost:3201/" - MC_TX_SOURCE_URL="http://localhost:4566/node-0-ledger/,http://localhost:4566/node-1-ledger/" + MC_TX_SOURCE_URL="file:///home/$USER/full-service/mobilecoin/target/docker/release/mc-local-network/node-ledger-distribution-0,file:///home/$USER/full-service/mobilecoin/target/docker/release/mc-local-network/node-ledger-distribution-1" fi MC_FOG_INGEST_ENCLAVE_CSS="${WORK_DIR}/ingest-enclave.css" ;; From 3fd467802ba9255a97907c7592419add04f0ac7f Mon Sep 17 00:00:00 2001 From: p Date: Wed, 8 Feb 2023 13:10:20 -0800 Subject: [PATCH 4/5] Update tools/test.sh Co-authored-by: Eran Rundstein --- tools/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test.sh b/tools/test.sh index f1dd082a5..dbd55b286 100755 --- a/tools/test.sh +++ b/tools/test.sh @@ -5,7 +5,7 @@ # RUSTFLAGS="-C instrument-coverage" \ if ! [[ -f "$(pwd)/consensus-enclave.css" ]]; then - echo "Please copy the consensus enclave to $(pwd)" + echo "Please copy the consensus-enclave.css to $(pwd)" exit 1 fi From c6fab4a9d4475649c22da3ee6d09a7c79ba61bfb Mon Sep 17 00:00:00 2001 From: Pouneh Aghababazadeh Date: Wed, 8 Feb 2023 14:18:05 -0800 Subject: [PATCH 5/5] make path more generic --- tools/run-fs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run-fs.sh b/tools/run-fs.sh index 91412f81a..d7969d427 100755 --- a/tools/run-fs.sh +++ b/tools/run-fs.sh @@ -130,7 +130,7 @@ case "${net}" in if [[ -z "${offline}" ]] then MC_PEER="insecure-mc://localhost:3200/,insecure-mc://localhost:3201/" - MC_TX_SOURCE_URL="file:///home/$USER/full-service/mobilecoin/target/docker/release/mc-local-network/node-ledger-distribution-0,file:///home/$USER/full-service/mobilecoin/target/docker/release/mc-local-network/node-ledger-distribution-1" + MC_TX_SOURCE_URL="file://$PWD/mobilecoin/target/docker/release/mc-local-network/node-ledger-distribution-0,file://$PWD/mobilecoin/target/docker/release/mc-local-network/node-ledger-distribution-1" fi MC_FOG_INGEST_ENCLAVE_CSS="${WORK_DIR}/ingest-enclave.css" ;;