Skip to content

fix make check-abcipp and make clippy-abcipp #869

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
tzemanovic merged 2 commits into from
Dec 8, 2022
Merged

fix make check-abcipp and make clippy-abcipp #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3150aec
fix `make check-abcipp` and `make clippy-abcipp`
tzemanovic Dec 7, 2022
dd77d8f
[ci] wasm checksums update
github-actions[bot] Dec 8, 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
7 changes: 5 additions & 2 deletions encoding_spec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ resolver = "2"
version = "0.11.0"

[features]
default = []
default = ["abciplus"]
abciplus = [
"namada/abciplus"
]

[dependencies]
namada = {path = "../shared"}
namada = {path = "../shared", default-features = false}
borsh = "0.9.0"
itertools = "0.10.3"
lazy_static = "1.4.0"
Expand Down
7 changes: 5 additions & 2 deletions proof_of_stake/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ resolver = "2"
version = "0.11.0"

[features]
default = []
default = ["abciplus"]
abciplus = [
"namada_core/abciplus",
]
# testing helpers
testing = ["proptest"]

[dependencies]
namada_core = {path = "../core"}
namada_core = {path = "../core", default-features = false}
borsh = "0.9.1"
derivative = "2.2.0"
# A fork with state machine testing
Expand Down
5 changes: 3 additions & 2 deletions shared/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ abcipp = [
]
abciplus = [
"namada_core/abciplus",
"namada_proof_of_stake/abciplus",
"ibc",
"ibc-proto",
"tendermint",
Expand All @@ -76,8 +77,8 @@ testing = [
]

[dependencies]
namada_core = {path = "../core", features = ["secp256k1-sign-verify"]}
namada_proof_of_stake = {path = "../proof_of_stake"}
namada_core = {path = "../core", default-features = false, features = ["secp256k1-sign-verify"]}
namada_proof_of_stake = {path = "../proof_of_stake", default-features = false}
async-trait = {version = "0.1.51", optional = true}
bellman = "0.11.2"
bls12_381 = "0.6.1"
Expand Down
14 changes: 10 additions & 4 deletions tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,19 @@ resolver = "2"
version = "0.11.0"

[features]
default = ["wasm-runtime"]
default = ["abciplus", "wasm-runtime"]
abciplus = [
"namada/abciplus",
"namada/ibc-mocks",
"namada_vp_prelude/abciplus",
"namada_tx_prelude/abciplus",
]
wasm-runtime = ["namada/wasm-runtime"]

[dependencies]
namada = {path = "../shared", features = ["testing", "ibc-mocks"]}
namada_vp_prelude = {path = "../vp_prelude"}
namada_tx_prelude = {path = "../tx_prelude"}
namada = {path = "../shared", default-features = false, features = ["testing"]}
namada_vp_prelude = {path = "../vp_prelude", default-features = false}
namada_tx_prelude = {path = "../tx_prelude", default-features = false}
chrono = {version = "0.4.22", default-features = false, features = ["clock", "std"]}
concat-idents = "1.1.2"
ibc = {version = "0.14.0", default-features = false}
Expand Down
13 changes: 9 additions & 4 deletions tx_prelude/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@ resolver = "2"
version = "0.11.0"

[features]
default = []
default = ["abciplus"]
abciplus = [
"namada_core/abciplus",
"namada_proof_of_stake/abciplus",
"namada_vm_env/abciplus",
]

[dependencies]
masp_primitives = { git = "https://github.com/anoma/masp", rev = "bee40fc465f6afbd10558d12fe96eb1742eee45c" }
namada_core = {path = "../core", features = ["abciplus"]}
namada_core = {path = "../core", default-features = false}
namada_macros = {path = "../macros"}
namada_proof_of_stake = {path = "../proof_of_stake"}
namada_vm_env = {path = "../vm_env"}
namada_proof_of_stake = {path = "../proof_of_stake", default-features = false}
namada_vm_env = {path = "../vm_env", default-features = false}
borsh = "0.9.0"
sha2 = "0.10.1"
thiserror = "1.0.30"
Expand Down
7 changes: 5 additions & 2 deletions vm_env/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ resolver = "2"
version = "0.11.0"

[features]
default = []
default = ["abciplus"]
abciplus = [
"namada_core/abciplus",
]

[dependencies]
namada_core = {path = "../core"}
namada_core = {path = "../core", default-features = false}
borsh = "0.9.0"
#libmasp = { git = "https://github.com/anoma/masp", branch = "murisi/masp-incentive" }
masp_primitives = { git = "https://github.com/anoma/masp", rev = "bee40fc465f6afbd10558d12fe96eb1742eee45c" }
Expand Down
13 changes: 9 additions & 4 deletions vp_prelude/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@ resolver = "2"
version = "0.11.0"

[features]
default = []
default = ["abciplus"]
abciplus = [
"namada_core/abciplus",
"namada_proof_of_stake/abciplus",
"namada_vm_env/abciplus",
]

[dependencies]
namada_core = {path = "../core"}
namada_core = {path = "../core", default-features = false}
namada_macros = {path = "../macros"}
namada_proof_of_stake = {path = "../proof_of_stake"}
namada_vm_env = {path = "../vm_env"}
namada_proof_of_stake = {path = "../proof_of_stake", default-features = false}
namada_vm_env = {path = "../vm_env", default-features = false}
borsh = "0.9.0"
sha2 = "0.10.1"
thiserror = "1.0.30"
34 changes: 17 additions & 17 deletions wasm/checksums.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"tx_bond.wasm": "tx_bond.607ff5fa2f3239c95077b16ceefde7f673eee3d135f00c00bdd650ce28633ac5.wasm",
"tx_change_validator_commission.wasm": "tx_change_validator_commission.68369752850d31b94d5212a644eedd921201d261aa591f58b8c2162e23116947.wasm",
"tx_ibc.wasm": "tx_ibc.4731e4d7b2a0c542da632bce7866639656905c9f7ab22099a2e2d1b12820736e.wasm",
"tx_init_account.wasm": "tx_init_account.f978f4eafdb8075e9e1be1160afd0cf2e57f31ef5fbdf8350170a4dbb8d1f1de.wasm",
"tx_init_proposal.wasm": "tx_init_proposal.aec4904ba5371bf0927c41a615d48257e1c08e6c80aa7b34b45370b65aeebe0a.wasm",
"tx_init_validator.wasm": "tx_init_validator.badefa4715e4bb265a0376d65e05648225e0780c52fe8c5083cbaf3bfcbd9ff2.wasm",
"tx_reveal_pk.wasm": "tx_reveal_pk.139863565d10266796860a4f977665be8524e14825b7b0eb5aabb13db5aa590e.wasm",
"tx_transfer.wasm": "tx_transfer.c8864ad3e620b809d7874f61b14cc8179ee220da855ddf288ebca50428f89bbf.wasm",
"tx_unbond.wasm": "tx_unbond.d3ca1fece60779942adfa3b4de7d65ecc9ba3bb52843b96b8b1dae2674b6fa61.wasm",
"tx_bond.wasm": "tx_bond.f5d548aad31a708eaba6efce8fa7098307386d765a4b0c4c69968d1d58fc78de.wasm",
"tx_change_validator_commission.wasm": "tx_change_validator_commission.e04bb99f65b51db0930162334d4ca0a79b0de58077b77cd6f70419791d4bc0a0.wasm",
"tx_ibc.wasm": "tx_ibc.fef8f4de6d037dda95c2432d037072e21a58e26778cd6bea84fc4027c4cb6789.wasm",
"tx_init_account.wasm": "tx_init_account.761e80df256282d664d6badb9cad835e12b6d3780a9c6fe98189cc6e2d1fdd9a.wasm",
"tx_init_proposal.wasm": "tx_init_proposal.fa45417163d128fa1b563dc75c43123b79e70685a90a59f60443e2278871f1ef.wasm",
"tx_init_validator.wasm": "tx_init_validator.722cf578bf77e6d0f93a6c0c615965a1ab1e1718d81ead4c26871d723e5ca9bb.wasm",
"tx_reveal_pk.wasm": "tx_reveal_pk.0edd9dfc5a90e25dfdbe0d3eab88e2dea603876f2dad0f5963e6f30fe8cdfe7b.wasm",
"tx_transfer.wasm": "tx_transfer.77d63ff3b47efdf00e937c297c52692a085624e26e4d0a937c7133e4b60b1a38.wasm",
"tx_unbond.wasm": "tx_unbond.727e961f34d68b89bdb5e09d44c6bf3e6f8bfc5997969864f5256a15d9bd38f0.wasm",
"tx_update_vp.wasm": "tx_update_vp.ee2e9b882c4accadf4626e87d801c9ac8ea8c61ccea677e0532fc6c1ee7db6a2.wasm",
"tx_vote_proposal.wasm": "tx_vote_proposal.b33288153249f20e43942bcb21c2862e68e2edd865638174e3557255bd7f11a5.wasm",
"tx_withdraw.wasm": "tx_withdraw.64bce44372b48eddcc319d1693fa6e821ca96cfc3ce2f2c55f4c0877677311a9.wasm",
"vp_implicit.wasm": "vp_implicit.82a65be788b416b3c499c8508c8e06d31ba008bc566b66b7d6cba31ed07df6fd.wasm",
"vp_masp.wasm": "vp_masp.d292c4e7521b60aac06bb1e82662367ddf33320f2afc9e76aa061f46b9fbeb9f.wasm",
"vp_testnet_faucet.wasm": "vp_testnet_faucet.41932ec7f908cac3068206a23f8aa9ad342874b2740a8401dfb5c113faac21e3.wasm",
"vp_token.wasm": "vp_token.44c58074c09cda85bb00a9d8d17eb9d1f339338ddf48d6632f21be46a9014cad.wasm",
"vp_user.wasm": "vp_user.b6c7ea01d4aa9d81dc3ca832dbfa334c6c396ce33fdb810b9df119611dca28c7.wasm",
"vp_validator.wasm": "vp_validator.0b503ef4b99cead9a0a3ba803a887e48d0f5aca2ba280751691350269db7265b.wasm"
"tx_vote_proposal.wasm": "tx_vote_proposal.a6c9b8c6ae8cc7ec3193e6d6be46be4e8f329f173391ff7a498977d732fdfd73.wasm",
"tx_withdraw.wasm": "tx_withdraw.809c18e2424942fab464d95b57681ee79bcb49aede0deceddff313e1337dd091.wasm",
"vp_implicit.wasm": "vp_implicit.2ec7662257847b995b66f236afea692b047af8226aa26d504026a30a498ac9f1.wasm",
"vp_masp.wasm": "vp_masp.8c9610656fd8084611909902750965d933525e5f6cfdfa4caaf38b53d43f358a.wasm",
"vp_testnet_faucet.wasm": "vp_testnet_faucet.f40b4c65f0736f10af775916fe7defacdc1ae83694cb051224ba6682dcd081a1.wasm",
"vp_token.wasm": "vp_token.405aa6d1107bb99233d11681b37a4a4e13f48552c3031b9503cf213b5c424d41.wasm",
"vp_user.wasm": "vp_user.3a556baef41c7862fcb5fc4dfcb0f24655c85d77148b5eaafcfb89ecc2fc8f41.wasm",
"vp_validator.wasm": "vp_validator.71a76c63818268e8c609661027519692de34d0d9d3ac22337115b269d9ed10a0.wasm"
}