Skip to content

A0-1610: Contract support redux #816

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

Merged
obrok merged 21 commits into from
Dec 29, 2022
Merged

A0-1610: Contract support redux #816

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6e17075
Add e2e tests for a simple contract
obrok Dec 16, 2022
8b3e7ec
Fix tests and warnings
obrok Dec 16, 2022
a063c84
Run adder test on CI
obrok Dec 19, 2022
9c2426d
Install fmt/clippy/wasm target per package on CI
obrok Dec 19, 2022
3baf23a
Install cargo contract for e2e tests
obrok Dec 19, 2022
813a026
Install cargo-contract only in adder test
obrok Dec 19, 2022
dce0aa6
Install rust-src for 1.65.0 on CI
obrok Dec 21, 2022
867dbc3
Set adder metadata on CI
obrok Dec 21, 2022
75bea24
Pass ADDER_METADATA to adder test
obrok Dec 21, 2022
13adbd4
Extend adder test timeout
obrok Dec 21, 2022
561cd1a
Give names to adder arguments in CI
obrok Dec 21, 2022
b6581d4
Mount contract dir in e2e tests (for the metadata)
obrok Dec 21, 2022
1f33c99
Fix clippy
obrok Dec 23, 2022
dfa03fa
Merge branch 'main' into obrok/contract-support-redux
obrok Dec 23, 2022
e280ff3
Bump aleph-client to 2.5.0
obrok Dec 27, 2022
f7563d4
Authenticate when installing protoc
obrok Dec 27, 2022
985942f
Revert "Authenticate when installing protoc"
obrok Dec 27, 2022
874a325
Add Option<T> conversion for contract returns
obrok Dec 27, 2022
3df5c2f
Extract variables
obrok Dec 27, 2022
1c29d22
Merge branch 'main' into obrok/contract-support-redux
obrok Dec 27, 2022
4f8a01b
Merge branch 'main' into obrok/contract-support-redux
obrok Dec 29, 2022
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
Prev Previous commit
Next Next commit
Mount contract dir in e2e tests (for the metadata)
  • Loading branch information
@obrok
obrok committed Dec 21, 2022
commit b6581d4d97b2e15c2504943a00a4efb6fa9515c4
1 change: 0 additions & 1 deletion .github/actions/run-e2e-test/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ runs:
if [[ "${DEPLOY_ADDER}" = "true" ]]; then
pushd contracts/adder
export ADDER=$(./deploy.sh)
export ADDER_METADATA=$(pwd)/target/ink/metadata.json
popd
fi

Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/run_e2e_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ fi

if [[ -n "${ADDER:-}" ]]; then
ARGS+=(-e "ADDER=${ADDER}")
ARGS+=(-e "ADDER_METADATA=${ADDER_METADATA}")
ARGS+=(-e "ADDER_METADATA=/contracts/adder/target/ink/metadata.json")
fi

docker run -v $(pwd)/docker/data:/data "${ARGS[@]}" aleph-e2e-client:latest
docker run -v "$(pwd)/contracts:/contracts" -v "$(pwd)/docker/data:/data" "${ARGS[@]}" aleph-e2e-client:latest

exit $?