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

fix: [VER-2721] rust/basic_dao #851

Merged
merged 15 commits into from
Apr 26, 2024
Merged

fix: [VER-2721] rust/basic_dao #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
680301f
change imports
Apr 24, 2024
2c438df
repl version
Apr 24, 2024
8e39ccc
repl
Apr 24, 2024
6d1daf0
ic repl
Apr 24, 2024
d71f064
ic repl
Apr 24, 2024
b3c025d
ic repl
Apr 24, 2024
ca1c608
Improve failure error message for invoice-canister
ninegua Apr 26, 2024
5a38fba
Remove the fragile canister id check
ninegua Apr 26, 2024
5230cb6
Remove redundant node-sass dependency from nft-wallet frontend
ninegua Apr 26, 2024
3f9df1f
Fix invoice-canister e2e test
ninegua Apr 26, 2024
007621d
Revert changes to invoice-canister test
ninegua Apr 26, 2024
5d444a4
Fix periodic_tasks
ninegua Apr 26, 2024
0809fb6
Change invoice canister id in test
ninegua Apr 26, 2024
8251802
Fix
ninegua Apr 26, 2024
64b1d99
Fix
ninegua Apr 26, 2024
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 .github/workflows/provision-darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ source "$HOME/Library/Application Support/org.dfinity.dfx/env"
dfx cache install

# Install ic-repl
version=0.1.2
version=0.7.0
curl --location --output ic-repl "https://github.com/chenyan2002/ic-repl/releases/download/$version/ic-repl-macos"
mv ./ic-repl /usr/local/bin/ic-repl
chmod a+x /usr/local/bin/ic-repl
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/provision-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source "$HOME/.local/share/dfx/env"
dfx cache install

# Install ic-repl
version=0.1.2
version=0.7.0
curl --location --output ic-repl "https://github.com/chenyan2002/ic-repl/releases/download/$version/ic-repl-linux64"
mv ./ic-repl /usr/local/bin/ic-repl
chmod a+x /usr/local/bin/ic-repl
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/rust-periodic_tasks-example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
- uses: actions/checkout@v1
- name: Provision Darwin
run: bash .github/workflows/provision-darwin.sh
- name: Remove networks.json
run: rm -f ~/.config/dfx/networks.json
- name: Rust Periodic Tasks Darwin
run: |
dfx start --background
Expand All @@ -31,6 +33,8 @@ jobs:
- uses: actions/checkout@v1
- name: Provision Linux
run: bash .github/workflows/provision-linux.sh
- name: Remove networks.json
run: rm -f ~/.config/dfx/networks.json
- name: Rust Periodic Tasks Linux
run: |
dfx start --background
Expand Down
2 changes: 1 addition & 1 deletion motoko/basic_dao/tests/account.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
load "prelude.sh";

import fake = "2vxsx-fae" as "../.dfx/local/canisters/basic_dao/basic_dao.did";
let wasm = file "../.dfx/local/canisters/basic_dao/basic_dao.wasm";
let wasm = file("../.dfx/local/canisters/basic_dao/basic_dao.wasm");


// Setup initial account
Expand Down
3 changes: 1 addition & 2 deletions motoko/basic_dao/tests/proposal.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ load "prelude.sh";
// This will not be needed once replica supports custom section
import fake = "2vxsx-fae" as "../.dfx/local/canisters/basic_dao/basic_dao.did";

let wasm = file "../.dfx/local/canisters/basic_dao/basic_dao.wasm";
let wasm = file("../.dfx/local/canisters/basic_dao/basic_dao.wasm");

identity alice;
identity bob;
Expand Down Expand Up @@ -155,4 +155,3 @@ upgrade(DAO, wasm, init);
call DAO.list_proposals();
assert _[0].state == variant { succeeded };
assert _[1].state == variant { rejected };
assert _[2].state.failed ~= "has no update method 'transfer'";
michael-weigelt marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions motoko/invoice-canister/clean-startup.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const constants = {
icrc1SubaccountBlobLiteral: `\\dc\\f6(N7;lQ\\e0\\9aG&\\1e\\fb\\bfI\\c2\\95\\bdS\\88\\08\\de2\\f8\\bc\\eb\\a3bZl\\60`
},
},
invoiceCanisterId: 'q4eej-kyaaa-aaaaa-aaaha-cai',
invoiceCanisterId: 'bkyz2-fmaaa-aaaaa-qaaaq-cai',
icpLedgerCanisterDfxJsonName: 'icp_ledger_canister',
icrc1ExampleToken: {
dfxJsonName: 'icrc1_token_ledger_canister_ex1',
Expand Down Expand Up @@ -297,7 +297,7 @@ const second_e2e_precheck = async ({ testing }) => {
const invoiceCanisterId = `${await $`dfx canister id invoice`}`.trim();
if (invoiceCanisterId !== constants.invoiceCanisterId) {
throw new Error(
'Mismatch between expected canister id and current invoice canister id\n'
`Mismatch between expected canister id ${constants.invoiceCanisterId} and current invoice canister id ${invoiceCanisterId}{\n`
+'indicates breaking change for E2E tests. Aborting...',
);
}
Expand Down
2 changes: 1 addition & 1 deletion motoko/invoice-canister/test/e2e/src/utils/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const aPriori = {
invoiceCanister: {
canisterId: {
principal: {
asText: 'q4eej-kyaaa-aaaaa-aaaha-cai',
asText: 'bkyz2-fmaaa-aaaaa-qaaaq-cai',
},
},
// Used in to_other_address_form for non-trivial subaccount ICRC1 account case.
Expand Down
Loading
Loading