Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Script improvements #702

Merged
merged 8 commits into from
Feb 10, 2023
Merged

Script improvements #702

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8144d22
Fix alternative sigstruct source
pouneh Feb 8, 2023
fb99dde
Early exit on test script if missing consensus enclave
pouneh Feb 8, 2023
01b9627
Change the tx_source_url when running full-service against a local ne…
pouneh Feb 8, 2023
3fd4678
Update tools/test.sh
pouneh Feb 8, 2023
c6fab4a
make path more generic
pouneh Feb 8, 2023
1169ec1
Merge branch 'develop' into bugfix/script_improvements
pouneh Feb 9, 2023
aaf8515
Merge branch 'develop' into bugfix/script_improvements
pouneh Feb 9, 2023
ebc0ace
Merge branch 'develop' into bugfix/script_improvements
pouneh Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/build-fs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
*)
Expand Down
2 changes: 1 addition & 1 deletion tools/run-fs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://$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"
;;
Expand Down
5 changes: 5 additions & 0 deletions tools/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

# RUSTFLAGS="-C instrument-coverage" \

if ! [[ -f "$(pwd)/consensus-enclave.css" ]]; then
echo "Please copy the consensus-enclave.css 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
Expand Down