Skip to content

Commit

Permalink
build: clippy, fmt, machete
Browse files Browse the repository at this point in the history
  • Loading branch information
apollo-sturdy committed Aug 20, 2024
1 parent dbcad6b commit c9707bd
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 13 deletions.
2 changes: 0 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ test-case = "3.0.0"
proptest = "1.0.0"
cw-multi-test = "=1.2.0"
apollo-cw-multi-test = { git = "https://github.com/apollodao/cw-multi-test.git", rev = "7e7bc2b91a8199c47815b45ef23b3ab07390ae3a",features = ["stargate"] }
getrandom = { version = "0.2", features = ["js"] }

# Workspace packages
cw-dex = { path = "cw-dex", version = "0.5.3" }
Expand Down
4 changes: 2 additions & 2 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ command = "cargo"
args = ["check"]

[tasks.clippy-check]
toolchain = "${NIGHTLY_VERSION}"
toolchain = "${RUST_VERSION}"
command = "cargo"
args = ["clippy","--all-features","--","-D","warnings"]
[tasks.clippy-fix]
toolchain = "${NIGHTLY_VERSION}"
toolchain = "${RUST_VERSION}"
command = "cargo"
args = ["clippy","--all-features", "--fix","--allow-staged", "--allow-dirty", "--","-D","warnings"]

Expand Down
1 change: 0 additions & 1 deletion cw-dex-astroport/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ apollo-cw-asset = { workspace = true, features = ["astroport"] }
cw-utils = { workspace = true }
cw20 = { workspace = true }
apollo-utils = { workspace = true }
osmosis-std = { workspace = true }

# Astroport
astroport = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions cw-dex-astroport/src/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ impl AstroportPool {
Ok(pool)
}
AssetInfo::Native(native_denom) => {
// To figure out if the native denom is a LP token, we need to check which address
// created the native denom and check if that address is an Astroport pair
// contract.
// To figure out if the native denom is a LP token, we need to check which
// address created the native denom and check if that address is
// an Astroport pair contract.
let denom_authority_metadata = parse_address(native_denom)?;

// Try to create an `AstroportPool` object with the creator address. This will
Expand Down
3 changes: 1 addition & 2 deletions cw-dex-astroport/tests/astroport_tests.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
mod tests {
use apollo_cw_asset::{Asset, AssetInfo, AssetInfoBase, AssetList};
use apollo_cw_multi_test::BasicAppBuilder;
use apollo_cw_multi_test::WasmKeeper;
use apollo_cw_multi_test::{BasicAppBuilder, WasmKeeper};
use apollo_utils::assets::separate_natives_and_cw20s;
use apollo_utils::coins::coin_from_str;
use apollo_utils::submessages::{find_event, parse_attribute_value};
Expand Down
4 changes: 3 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ vulnerability = "deny"
unmaintained = "deny"
notice = "deny"
unsound = "deny"
ignore = []
ignore = [
"RUSTSEC-2024-0344" # Confirmed as not applicable to CosmWasm: https://github.com/CosmWasm/cosmwasm/issues/2175#issuecomment-2180960022
]

[bans]
multiple-versions = "allow"
Expand Down
1 change: 0 additions & 1 deletion test-contracts/astroport-test-contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ apollo-cw-asset = { workspace = true }
cw-dex = { workspace = true }
cw-dex-astroport = { workspace = true }
cw-dex-test-contract = { workspace = true }
getrandom = { workspace = true }

0 comments on commit c9707bd

Please sign in to comment.