Skip to content

Commit df39fe9

Browse files
KayanskiKayanski
authored
Fix/ci (#530)
* Update insta review * Added taplo * Removed clippy warning deprecated * Eliding lifetimes clippy * Nits for clipy
1 parent 26f10dc commit df39fe9

File tree

35 files changed

+555
-573
lines changed

35 files changed

+555
-573
lines changed

‎.github/workflows/check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
# https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
8080
strategy:
8181
matrix:
82-
msrv: [1.76.0] # dep/feat syntax fixed with co-exist dep
82+
msrv: [1.78.0] # dep/feat syntax fixed with co-exist dep
8383
name: ubuntu / ${{ matrix.msrv }}
8484
steps:
8585
- uses: actions/checkout@v4

‎Cargo.toml

+35-37
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
[workspace]
2+
exclude = [
3+
"test_contracts/compatibility-test", # TODO: add new after cw-orch-core 2.0.0 as it's breaking, it shouldn't be compatible
4+
]
25
members = [
36
"cw-orch",
47
"cw-orch-daemon",
@@ -15,77 +18,72 @@ members = [
1518
"packages/interchain/*",
1619
"packages/integrations/*",
1720
]
18-
exclude = [
19-
"test_contracts/compatibility-test", # TODO: add new after cw-orch-core 2.0.0 as it's breaking, it shouldn't be compatible
20-
]
2121
resolver = "2"
2222

2323
[workspace.package]
24-
authors = ["CyberHoward <cyberhoward@protonmail.com>"]
25-
edition = "2021"
26-
license = "LGPL-3.0"
24+
authors = ["CyberHoward <cyberhoward@protonmail.com>"]
25+
edition = "2021"
26+
license = "LGPL-3.0"
2727
repository = "https://github.com/AbstractSDK/cw-orchestrator"
2828

2929
[workspace.dependencies]
30-
cw-utils = { version = "2.0.0" }
31-
cosmwasm-std = { version = "2.1" }
32-
cw-storage-plus = { version = "2.0.0" }
3330
cosmos-sdk-proto = { version = "0.24.0", default-features = false }
31+
cosmwasm-std = { version = "2.1" }
32+
cw-storage-plus = { version = "2.0.0" }
33+
cw-utils = { version = "2.0.0" }
3434

35-
cw-multi-test = { package = "abstract-cw-multi-test", version = "2.0.2", features = [
36-
"cosmwasm_1_2",
37-
] }
38-
cw20 = { version = "2.0.0" }
39-
cw20-base = { version = "2.0.0" }
35+
cw-multi-test = { package = "abstract-cw-multi-test", version = "2.0.2", features = ["cosmwasm_1_2"] }
36+
cw20 = { version = "2.0.0" }
37+
cw20-base = { version = "2.0.0" }
4038

41-
osmosis-test-tube = { version = "27.0.0" }
4239
neutron-test-tube = { version = "=5.0.1" }
40+
osmosis-test-tube = { version = "27.0.0" }
4341

4442
anyhow = "1.0"
45-
serde = { version = "1.0.208", default-features = false, features = ["derive"] }
46-
tokio = { version = "1.39", features = ["full"] }
43+
serde = { version = "1.0.208", default-features = false, features = ["derive"] }
44+
tokio = { version = "1.39", features = ["full"] }
4745

48-
cw-orch = { path = "./cw-orch", version = "0.27.0" }
49-
cw-orch-daemon = { path = "./cw-orch-daemon", version = "0.28.0" }
50-
cw-orch-core = { path = "packages/cw-orch-core", version = "2.1.3" }
51-
cw-orch-traits = { path = "packages/cw-orch-traits", version = "0.25.0" }
52-
cw-orch-mock = { path = "packages/cw-orch-mock", version = "0.24.2" }
46+
cw-orch = { path = "./cw-orch", version = "0.27.0" }
47+
cw-orch-core = { path = "packages/cw-orch-core", version = "2.1.3" }
48+
cw-orch-daemon = { path = "./cw-orch-daemon", version = "0.28.0" }
49+
cw-orch-mock = { path = "packages/cw-orch-mock", version = "0.24.2" }
5350
cw-orch-networks = { path = "packages/cw-orch-networks", version = "0.24.3" }
51+
cw-orch-traits = { path = "packages/cw-orch-traits", version = "0.25.0" }
5452

5553
# Macros
5654
cw-orch-contract-derive = { path = "packages/macros/cw-orch-contract-derive", version = "0.21.0" }
57-
cw-orch-fns-derive = { path = "packages/macros/cw-orch-fns-derive", version = "0.23.0" }
55+
cw-orch-fns-derive = { path = "packages/macros/cw-orch-fns-derive", version = "0.23.0" }
5856

5957
# Extensions
60-
cw-orch-osmosis-test-tube = { version = "0.4.0", path = "packages/cw-orch-osmosis-test-tube" }
6158
cw-orch-neutron-test-tube = { version = "0.1.0", path = "packages/cw-orch-neutron-test-tube" }
59+
cw-orch-osmosis-test-tube = { version = "0.4.0", path = "packages/cw-orch-osmosis-test-tube" }
6260

6361
#Clone Testing
6462
cw-orch-clone-testing = { version = "0.8.0", path = "packages/clone-testing" }
6563

6664
# Interchain
67-
cw-orch-interchain = { path = "cw-orch-interchain", version = "0.8.0" }
68-
cw-orch-interchain-core = { path = "packages/interchain/interchain-core", version = "0.9.0" }
65+
cw-orch-interchain = { path = "cw-orch-interchain", version = "0.8.0" }
66+
cw-orch-interchain-core = { path = "packages/interchain/interchain-core", version = "0.9.0" }
6967
cw-orch-interchain-daemon = { path = "packages/interchain/interchain-daemon", version = "0.9.0" }
70-
cw-orch-interchain-mock = { path = "packages/interchain/interchain-mock", version = "0.9.0" }
71-
cw-orch-starship = { path = "packages/interchain/starship", version = "0.7.0" }
72-
cw-orch-proto = { path = "packages/interchain/proto", version = "0.9.0" }
68+
cw-orch-interchain-mock = { path = "packages/interchain/interchain-mock", version = "0.9.0" }
69+
cw-orch-proto = { path = "packages/interchain/proto", version = "0.9.0" }
70+
cw-orch-starship = { path = "packages/interchain/starship", version = "0.7.0" }
7371

7472

75-
thiserror = { version = "1.0.63" }
76-
sha2 = { version = "0.10.8" }
77-
serde_json = "1.0.125"
78-
tonic = { version = "0.12.1" }
73+
cosmrs = { version = "0.19.0" }
74+
ibc-proto = { version = "0.47.0" }
75+
prost = "0.13.1"
7976
prost-types = "0.13.1"
80-
prost = "0.13.1"
81-
cosmrs = { version = "0.19.0" }
82-
ibc-proto = { version = "0.47.0" }
77+
serde_json = "1.0.125"
78+
sha2 = { version = "0.10.8" }
79+
thiserror = { version = "1.0.63" }
80+
tonic = { version = "0.12.1" }
8381
# Test deps
8482
speculoos = "0.11.0"
8583

8684
# Logging
8785
log = "0.4.22"
8886

8987
# Interchain
90-
ibc-relayer-types = { version = "0.29.2" }
9188
ibc-chain-registry = { version = "0.29.2" }
89+
ibc-relayer-types = { version = "0.29.2" }

‎contracts-ws/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ resolver = "2"
88
edition = "2021"
99

1010
[workspace.dependencies]
11-
cosmwasm-std = "2.0.0"
12-
cw20 = { version = "2.0.0" }
13-
cw20-base = { version = "2.0.0" }
11+
cosmwasm-std = "2.0.0"
1412
cw-storage-plus = { version = "2.0.0" }
13+
cw20 = { version = "2.0.0" }
14+
cw20-base = { version = "2.0.0" }
1515

16-
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1716
anyhow = "1.0"
18-
log = "0.4.14"
17+
log = "0.4.14"
18+
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1919

20-
cw-orch = { path = "../cw-orch", version = "0.27.0" }
20+
cw-orch = { path = "../cw-orch", version = "0.27.0" }
2121
cw-orch-interchain = { path = "../cw-orch-interchain", version = "0.8.1" }

‎contracts-ws/contracts/counter/Cargo.toml

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
[package]
2-
name = "counter-contract"
3-
version = "0.27.1"
42
description = "counter constract"
5-
keywords = ["cosmwasm", "blockchain"]
6-
edition = { workspace = true }
7-
license = "LGPL-3.0"
8-
exclude = [".env"]
3+
edition = { workspace = true }
4+
exclude = [".env"]
5+
keywords = ["cosmwasm", "blockchain"]
6+
license = "LGPL-3.0"
7+
name = "counter-contract"
8+
version = "0.27.1"
99

1010
[lib]
1111
crate-type = ["cdylib", "rlib"]
1212

1313
[features]
1414
default = ["export"]
15-
export = []
15+
export = []
1616

1717
[dependencies]
18-
cosmwasm-std = { workspace = true }
19-
cw-storage-plus = { workspace = true }
20-
cw2 = "2.0"
2118
cosmwasm-schema = "2.1"
22-
schemars = "0.8.21"
23-
thiserror = { version = "1.0.63" }
24-
serde = { workspace = true }
25-
serde_json = "1.0.125"
26-
cw-orch = { workspace = true, features = ["daemon"] }
19+
cosmwasm-std = { workspace = true }
20+
cw-orch = { workspace = true, features = ["daemon"] }
21+
cw-storage-plus = { workspace = true }
22+
cw2 = "2.0"
23+
schemars = "0.8.21"
24+
serde = { workspace = true }
25+
serde_json = "1.0.125"
26+
thiserror = { version = "1.0.63" }
2727
# Unused, only there to check for wasm compatibility
2828
cw-orch-interchain = { workspace = true, features = ["daemon"] }
2929

@@ -32,7 +32,7 @@ name = "deploy"
3232

3333
[dev-dependencies]
3434
# Deps for deployment
35-
dotenv = { version = "0.15.0" }
35+
anyhow = { workspace = true }
36+
cw-orch = { workspace = true, features = ["daemon"] }
37+
dotenv = { version = "0.15.0" }
3638
pretty_env_logger = { version = "0.5.0" }
37-
cw-orch = { workspace = true, features = ["daemon"] }
38-
anyhow = { workspace = true }

‎contracts-ws/contracts/mock_contract/Cargo.toml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
[package]
2-
name = "mock-contract"
3-
version = "0.1.0"
42
description = "Mock constract for cw-orch macro testing"
5-
keywords = ["cosmwasm", "blockchain"]
6-
edition = { workspace = true }
3+
edition = { workspace = true }
4+
keywords = ["cosmwasm", "blockchain"]
5+
name = "mock-contract"
6+
version = "0.1.0"
77

88
exclude = [".env"]
99

1010
[lib]
1111
crate-type = ["cdylib", "rlib"]
1212

1313
[features]
14-
default = ["export"]
15-
export = []
14+
default = ["export"]
15+
export = []
1616
interface = []
1717

1818
[dependencies]
19-
cosmwasm-std = { workspace = true }
20-
cw2 = { version = "2.0.0" }
21-
serde = { workspace = true }
22-
schemars = "0.8.21"
23-
serde_json = "1.0.125"
24-
thiserror = { version = "1.0.63" }
2519
cosmwasm-schema = "2.1"
26-
cw-orch = { workspace = true }
20+
cosmwasm-std = { workspace = true }
21+
cw-orch = { workspace = true }
2722
cw-storage-plus = { workspace = true }
23+
cw2 = { version = "2.0.0" }
24+
schemars = "0.8.21"
25+
serde = { workspace = true }
26+
serde_json = "1.0.125"
27+
thiserror = { version = "1.0.63" }

‎contracts-ws/contracts/mock_contract_u64/Cargo.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[package]
2-
name = "mock-contract-u64"
3-
version = "0.1.0"
42
description = "Mock constract for cw-orch macro testing"
5-
keywords = ["cosmwasm", "blockchain"]
6-
edition = { workspace = true }
3+
edition = { workspace = true }
4+
keywords = ["cosmwasm", "blockchain"]
5+
name = "mock-contract-u64"
6+
version = "0.1.0"
77

88
exclude = [".env"]
99

@@ -12,15 +12,15 @@ crate-type = ["cdylib", "rlib"]
1212

1313
[features]
1414
default = ["export"]
15-
export = []
15+
export = []
1616

1717
[dependencies]
18-
cosmwasm-std = { workspace = true }
19-
serde = { workspace = true }
20-
schemars = "0.8.21"
21-
serde_json = "1.0.125"
22-
thiserror = { version = "1.0.63" }
2318
cosmwasm-schema = "2.1"
24-
cw-orch = { workspace = true }
19+
cosmwasm-std = { workspace = true }
20+
cw-orch = { workspace = true }
21+
schemars = "0.8.21"
22+
serde = { workspace = true }
23+
serde_json = "1.0.125"
24+
thiserror = { version = "1.0.63" }
2525

2626
mock-contract = { path = "../mock_contract" }

0 commit comments

Comments
 (0)