From 5f6da055453fe0abb72d75df9063f289c62939df Mon Sep 17 00:00:00 2001 From: Nikolas Haimerl Date: Mon, 8 Jan 2024 09:11:45 +0000 Subject: [PATCH 1/5] removed exec_tools --- standards/ICRC-1/BUILD.bazel | 2 +- standards/ICRC-2/BUILD.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/standards/ICRC-1/BUILD.bazel b/standards/ICRC-1/BUILD.bazel index 06bba74d..68cd299c 100644 --- a/standards/ICRC-1/BUILD.bazel +++ b/standards/ICRC-1/BUILD.bazel @@ -11,7 +11,7 @@ genrule( srcs = [":README.md"], outs = ["ICRC-1-generated.did"], cmd_bash = "$(location @lmt) $(SRCS); mv ICRC-1.did $@", - exec_tools = ["@lmt"], + tools = ["@lmt"], ) didc_check_test( diff --git a/standards/ICRC-2/BUILD.bazel b/standards/ICRC-2/BUILD.bazel index a094347a..de1eb348 100644 --- a/standards/ICRC-2/BUILD.bazel +++ b/standards/ICRC-2/BUILD.bazel @@ -9,7 +9,7 @@ genrule( srcs = [":README.md"], outs = ["ICRC-2-generated.did"], cmd_bash = "$(location @lmt) $(SRCS); mv ICRC-2.did $@", - exec_tools = ["@lmt"], + tools = ["@lmt"], ) didc_subtype_test( From 88b3f88b0c8a0b2bb419c15beacf72cd8acbc00f Mon Sep 17 00:00:00 2001 From: Nikolas Haimerl Date: Tue, 16 Jan 2024 09:12:35 +0000 Subject: [PATCH 2/5] changed changelog --- Cargo.lock | 2 +- test/env/Cargo.toml | 2 +- test/env/Changelog.md | 4 ++++ test/env/replica/Changelog.md | 4 ++++ test/env/state-machine/Changelog.md | 4 ++++ test/suite/lib.rs | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6a21198..48618430 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "icrc1-test-env" -version = "0.1.1" +version = "0.1.11" dependencies = [ "anyhow", "async-trait", diff --git a/test/env/Cargo.toml b/test/env/Cargo.toml index e98dc898..d7b07626 100644 --- a/test/env/Cargo.toml +++ b/test/env/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icrc1-test-env" -version = "0.1.1" +version = "0.1.11" authors = { workspace = true } edition = { workspace = true } license = { workspace = true } diff --git a/test/env/Changelog.md b/test/env/Changelog.md index 27856a54..ec3122aa 100644 --- a/test/env/Changelog.md +++ b/test/env/Changelog.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.1.2] - 2024-01-16 +### Changed +- Use candid 0.10 + ## [0.1.1] - 2023-09-05 ### Changed - Updated candid to the latest version. diff --git a/test/env/replica/Changelog.md b/test/env/replica/Changelog.md index 27856a54..ec3122aa 100644 --- a/test/env/replica/Changelog.md +++ b/test/env/replica/Changelog.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.1.2] - 2024-01-16 +### Changed +- Use candid 0.10 + ## [0.1.1] - 2023-09-05 ### Changed - Updated candid to the latest version. diff --git a/test/env/state-machine/Changelog.md b/test/env/state-machine/Changelog.md index 27856a54..ec3122aa 100644 --- a/test/env/state-machine/Changelog.md +++ b/test/env/state-machine/Changelog.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.1.2] - 2024-01-16 +### Changed +- Use candid 0.10 + ## [0.1.1] - 2023-09-05 ### Changed - Updated candid to the latest version. diff --git a/test/suite/lib.rs b/test/suite/lib.rs index 36d183d1..70cf63c9 100644 --- a/test/suite/lib.rs +++ b/test/suite/lib.rs @@ -358,7 +358,7 @@ pub async fn icrc2_test_approve(ledger_env: impl LedgerEnv) -> anyhow::Result bail!("expected ApproveError::InsufficientFunds, got Ok result"), - Err(e) => match e { + Err(e) => match Fe { ApproveError::InsufficientFunds { balance } => { if balance != 0u8 { bail!("wrong balance, expected 0, got: {}", balance); From db087086a8d4f6a2a10020c4b3a1ff4e8889b0db Mon Sep 17 00:00:00 2001 From: Nikolas Haimerl Date: Tue, 16 Jan 2024 09:13:24 +0000 Subject: [PATCH 3/5] changed candid --- Cargo.lock | 2 +- test/env/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 48618430..90853e65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "icrc1-test-env" -version = "0.1.11" +version = "0.1.2" dependencies = [ "anyhow", "async-trait", diff --git a/test/env/Cargo.toml b/test/env/Cargo.toml index d7b07626..544e3a49 100644 --- a/test/env/Cargo.toml +++ b/test/env/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icrc1-test-env" -version = "0.1.11" +version = "0.1.2" authors = { workspace = true } edition = { workspace = true } license = { workspace = true } From eac91b3b7d2591c8ff000d33ea8936952e7dbb92 Mon Sep 17 00:00:00 2001 From: Nikolas Haimerl Date: Tue, 16 Jan 2024 09:24:14 +0000 Subject: [PATCH 4/5] changed candid --- Cargo.Bazel.lock | 50 +++++++++++++++---------------- Cargo.lock | 10 +++---- test/env/replica/Cargo.toml | 4 +-- test/env/state-machine/Cargo.toml | 4 +-- test/replica/Cargo.toml | 2 +- test/replica/Changelog.md | 4 +++ test/runner/Cargo.toml | 8 ++--- test/runner/Changelog.md | 4 +++ test/suite/Cargo.toml | 4 +-- test/suite/Changelog.md | 4 +++ test/suite/lib.rs | 2 +- 11 files changed, 54 insertions(+), 42 deletions(-) diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock index 5705bed9..93ea4fb5 100644 --- a/Cargo.Bazel.lock +++ b/Cargo.Bazel.lock @@ -1,5 +1,5 @@ { - "checksum": "942cd82014b8c6eda3ee0d7071384fcc88385b6eba317f44e868d48d42a9589b", + "checksum": "e043e2e8975a80ddea9541376c4d638403581d88f3e857f5c7bdf34cac2ac9bf", "crates": { "addr2line 0.21.0": { "name": "addr2line", @@ -4931,9 +4931,9 @@ }, "license": "Apache-2.0" }, - "icrc1-test-env 0.1.1": { + "icrc1-test-env 0.1.2": { "name": "icrc1-test-env", - "version": "0.1.1", + "version": "0.1.2", "repository": null, "targets": [ { @@ -4982,13 +4982,13 @@ ], "selects": {} }, - "version": "0.1.1" + "version": "0.1.2" }, "license": "Apache-2.0" }, - "icrc1-test-env-replica 0.1.1": { + "icrc1-test-env-replica 0.1.2": { "name": "icrc1-test-env-replica", - "version": "0.1.1", + "version": "0.1.2", "repository": null, "targets": [ { @@ -5045,13 +5045,13 @@ ], "selects": {} }, - "version": "0.1.1" + "version": "0.1.2" }, "license": "Apache-2.0" }, - "icrc1-test-env-state-machine 0.1.1": { + "icrc1-test-env-state-machine 0.1.2": { "name": "icrc1-test-env-state-machine", - "version": "0.1.1", + "version": "0.1.2", "repository": null, "targets": [ { @@ -5100,13 +5100,13 @@ ], "selects": {} }, - "version": "0.1.1" + "version": "0.1.2" }, "license": "Apache-2.0" }, - "icrc1-test-replica 0.1.1": { + "icrc1-test-replica 0.1.2": { "name": "icrc1-test-replica", - "version": "0.1.1", + "version": "0.1.2", "repository": null, "targets": [ { @@ -5146,13 +5146,13 @@ "selects": {} }, "edition": "2018", - "version": "0.1.1" + "version": "0.1.2" }, "license": "Apache-2.0" }, - "icrc1-test-runner 0.1.1": { + "icrc1-test-runner 0.1.2": { "name": "icrc1-test-runner", - "version": "0.1.1", + "version": "0.1.2", "repository": null, "targets": [], "library_target_name": null, @@ -5190,13 +5190,13 @@ "selects": {} }, "edition": "2018", - "version": "0.1.1" + "version": "0.1.2" }, "license": "Apache-2.0" }, - "icrc1-test-suite 0.1.1": { + "icrc1-test-suite 0.1.2": { "name": "icrc1-test-suite", - "version": "0.1.1", + "version": "0.1.2", "repository": null, "targets": [ { @@ -5232,7 +5232,7 @@ "selects": {} }, "edition": "2018", - "version": "0.1.1" + "version": "0.1.2" }, "license": "Apache-2.0" }, @@ -12486,12 +12486,12 @@ }, "binary_crates": [], "workspace_members": { - "icrc1-test-env 0.1.1": "test/env", - "icrc1-test-env-replica 0.1.1": "test/env/replica", - "icrc1-test-env-state-machine 0.1.1": "test/env/state-machine", - "icrc1-test-replica 0.1.1": "test/replica", - "icrc1-test-runner 0.1.1": "test/runner", - "icrc1-test-suite 0.1.1": "test/suite" + "icrc1-test-env 0.1.2": "test/env", + "icrc1-test-env-replica 0.1.2": "test/env/replica", + "icrc1-test-env-state-machine 0.1.2": "test/env/state-machine", + "icrc1-test-replica 0.1.2": "test/replica", + "icrc1-test-runner 0.1.2": "test/runner", + "icrc1-test-suite 0.1.2": "test/suite" }, "conditions": { "aarch64-linux-android": [ diff --git a/Cargo.lock b/Cargo.lock index 90853e65..fcab2cf9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -952,7 +952,7 @@ dependencies = [ [[package]] name = "icrc1-test-env-replica" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "async-trait", @@ -966,7 +966,7 @@ dependencies = [ [[package]] name = "icrc1-test-env-state-machine" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "async-trait", @@ -978,7 +978,7 @@ dependencies = [ [[package]] name = "icrc1-test-replica" -version = "0.1.1" +version = "0.1.2" dependencies = [ "ic-agent", "reqwest", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "icrc1-test-runner" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "candid", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "icrc1-test-suite" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "candid", diff --git a/test/env/replica/Cargo.toml b/test/env/replica/Cargo.toml index 3197aade..7ac52489 100644 --- a/test/env/replica/Cargo.toml +++ b/test/env/replica/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icrc1-test-env-replica" -version = "0.1.1" +version = "0.1.2" authors = { workspace = true } edition = { workspace = true } license = { workspace = true } @@ -19,4 +19,4 @@ rand = { workspace = true } ring = "0.16.20" hex = { workspace = true } async-trait = { workspace = true } -icrc1-test-env = { version = "0.1.1", path = "../" } +icrc1-test-env = { version = "0.1.2", path = "../" } diff --git a/test/env/state-machine/Cargo.toml b/test/env/state-machine/Cargo.toml index f997e9db..541f86d2 100644 --- a/test/env/state-machine/Cargo.toml +++ b/test/env/state-machine/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icrc1-test-env-state-machine" -version = "0.1.1" +version = "0.1.2" authors = { workspace = true } edition = { workspace = true } license = { workspace = true } @@ -17,4 +17,4 @@ candid = { workspace = true } async-trait = { workspace = true } hex = { workspace = true } ic-test-state-machine-client = { workspace = true } -icrc1-test-env = { version = "0.1.1", path = "../" } \ No newline at end of file +icrc1-test-env = { version = "0.1.2", path = "../" } \ No newline at end of file diff --git a/test/replica/Cargo.toml b/test/replica/Cargo.toml index 184bd766..3faf7808 100644 --- a/test/replica/Cargo.toml +++ b/test/replica/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icrc1-test-replica" -version = "0.1.1" +version = "0.1.2" authors = { workspace = true } edition = { workspace = true } license = { workspace = true } diff --git a/test/replica/Changelog.md b/test/replica/Changelog.md index 27856a54..ec3122aa 100644 --- a/test/replica/Changelog.md +++ b/test/replica/Changelog.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.1.2] - 2024-01-16 +### Changed +- Use candid 0.10 + ## [0.1.1] - 2023-09-05 ### Changed - Updated candid to the latest version. diff --git a/test/runner/Cargo.toml b/test/runner/Cargo.toml index 35d11adf..87c58b26 100644 --- a/test/runner/Cargo.toml +++ b/test/runner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icrc1-test-runner" -version = "0.1.1" +version = "0.1.2" authors = { workspace = true } edition = { workspace = true } license = { workspace = true } @@ -13,9 +13,9 @@ name = "runner" path = "main.rs" [dependencies] -icrc1-test-env = { version ="0.1.1", path = "../env" } -icrc1-test-env-replica = { version ="0.1.1", path = "../env/replica" } -icrc1-test-suite = { version ="0.1.1", path = "../suite" } +icrc1-test-env = { version ="0.1.2", path = "../env" } +icrc1-test-env-replica = { version ="0.1.2", path = "../env/replica" } +icrc1-test-suite = { version ="0.1.2", path = "../suite" } ic-agent = { workspace = true } pico-args = "0.5" reqwest = { workspace = true } diff --git a/test/runner/Changelog.md b/test/runner/Changelog.md index 27856a54..ec3122aa 100644 --- a/test/runner/Changelog.md +++ b/test/runner/Changelog.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.1.2] - 2024-01-16 +### Changed +- Use candid 0.10 + ## [0.1.1] - 2023-09-05 ### Changed - Updated candid to the latest version. diff --git a/test/suite/Cargo.toml b/test/suite/Cargo.toml index 488a85bb..812dae23 100644 --- a/test/suite/Cargo.toml +++ b/test/suite/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icrc1-test-suite" -version = "0.1.1" +version = "0.1.2" authors = { workspace = true } edition = { workspace = true } license = { workspace = true } @@ -15,4 +15,4 @@ path = "lib.rs" anyhow = "1.0" candid = { workspace = true } futures = "0.3.24" -icrc1-test-env = { version ="0.1.1", path = "../env" } +icrc1-test-env = { version ="0.1.2", path = "../env" } diff --git a/test/suite/Changelog.md b/test/suite/Changelog.md index 7471e433..412c095c 100644 --- a/test/suite/Changelog.md +++ b/test/suite/Changelog.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.1.2] - 2024-01-16 +### Changed +- Use candid 0.10 + ## [0.1.1] - 2023-09-05 ### Changed - Make amounts transferred and approved in tests independent of the ledger fee and relative within a single test diff --git a/test/suite/lib.rs b/test/suite/lib.rs index 70cf63c9..36d183d1 100644 --- a/test/suite/lib.rs +++ b/test/suite/lib.rs @@ -358,7 +358,7 @@ pub async fn icrc2_test_approve(ledger_env: impl LedgerEnv) -> anyhow::Result bail!("expected ApproveError::InsufficientFunds, got Ok result"), - Err(e) => match Fe { + Err(e) => match e { ApproveError::InsufficientFunds { balance } => { if balance != 0u8 { bail!("wrong balance, expected 0, got: {}", balance); From 713252badf3f17381ad955064fe23103d92897d7 Mon Sep 17 00:00:00 2001 From: Nikolas Haimerl Date: Tue, 16 Jan 2024 09:36:53 +0000 Subject: [PATCH 5/5] fmt --- standards/ICRC-1/BUILD.bazel | 2 +- standards/ICRC-2/BUILD.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/standards/ICRC-1/BUILD.bazel b/standards/ICRC-1/BUILD.bazel index 68cd299c..06bba74d 100644 --- a/standards/ICRC-1/BUILD.bazel +++ b/standards/ICRC-1/BUILD.bazel @@ -11,7 +11,7 @@ genrule( srcs = [":README.md"], outs = ["ICRC-1-generated.did"], cmd_bash = "$(location @lmt) $(SRCS); mv ICRC-1.did $@", - tools = ["@lmt"], + exec_tools = ["@lmt"], ) didc_check_test( diff --git a/standards/ICRC-2/BUILD.bazel b/standards/ICRC-2/BUILD.bazel index de1eb348..a094347a 100644 --- a/standards/ICRC-2/BUILD.bazel +++ b/standards/ICRC-2/BUILD.bazel @@ -9,7 +9,7 @@ genrule( srcs = [":README.md"], outs = ["ICRC-2-generated.did"], cmd_bash = "$(location @lmt) $(SRCS); mv ICRC-2.did $@", - tools = ["@lmt"], + exec_tools = ["@lmt"], ) didc_subtype_test(