Skip to content

Commit

Permalink
some clippy and warnings and more checks (#570)
Browse files Browse the repository at this point in the history
* some clippy and warnings and more checks

Signed-off-by: Dzmitry Lahoda <dzmitry@lahoda.pro>

* fixing build

Signed-off-by: Dzmitry Lahoda <dzmitry@lahoda.pro>

* fix version again

Signed-off-by: Dzmitry Lahoda <dzmitry@lahoda.pro>

* tuning deny

Signed-off-by: Dzmitry Lahoda <dzmitry@lahoda.pro>

* fixing rebase

Signed-off-by: Dzmitry Lahoda <dzmitry@lahoda.pro>

Co-authored-by: Ewere Diagboya <nimboya@gmail.com>
  • Loading branch information
2 people authored and hussein-aitlahcen committed Feb 3, 2022
1 parent 304736b commit 641ffbf
Show file tree
Hide file tree
Showing 28 changed files with 304 additions and 76 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 14.x

- name: Cargo fmt
run: |
cargo +nightly fmt --all -- --check
Expand Down Expand Up @@ -160,9 +161,18 @@ jobs:
./node_modules/.bin/remark -f $file || total_exit_code=$?
done << (find . -name "*.md" -not -path "*/node_modules/*" -not -path "./.github/*")
exit $total_exit_code
- name: Cargo clippy
run: |
SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets
SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets
- name: Cargo Single Depedency
# description: Speed up builds and reduced security check surface
run: |
cargo install -f cargo-deny
# start from minimal dependency crate
cargo deny --manifest-path ./frame/composable-support/Cargo.toml check Ban
- name: Cargo udeps
env:
UDEPS_VERSION: v0.1.24
Expand All @@ -174,4 +184,3 @@ jobs:
cargo udeps --version
SKIP_WASM_BUILD=1 cargo udeps --workspace --all-features
continue-on-error: true # Often this turns gives false positives, due to the different ways that Substrate uses features.

220 changes: 220 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
# generated with `cargo deny init`
# it is like authoritarian version of crev or like
# so for now used only feature to deny several deps of same crate

# This template contains all of the possible sections and their default values

# Note that all fields that take a lint level have these possible values:
# * deny - An error will be produced and the check will fail
# * warn - A warning will be produced, but the check will not fail
# * allow - No warning or error will be produced, though in some cases a note
# will be

# The values provided in this template are the default values that will be used
# when any section or field is not specified in your own configuration

# If 1 or more target triples (and optionally, target_features) are specified,
# only the specified targets will be checked when running `cargo deny check`.
# This means, if a particular package is only ever used as a target specific
# dependency, such as, for example, the `nix` crate only being used via the
# `target_family = "unix"` configuration, that only having windows targets in
# this list would mean the nix crate, as well as any of its exclusive
# dependencies not shared by any other crates, would be ignored, as the target
# list here is effectively saying which targets you are building for.
targets = [
# The triple can be any string, but only the target triples built in to
# rustc (as of 1.40) can be checked against actual config expressions
#{ triple = "x86_64-unknown-linux-musl" },
# You can also specify which target_features you promise are enabled for a
# particular target. target_features are currently not validated against
# the actual valid features supported by the target architecture.
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
]

# This section is considered when running `cargo deny check advisories`
# More documentation for the advisories section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
[advisories]
# The path where the advisory database is cloned/fetched into
db-path = "~/.cargo/advisory-db"
# The url(s) of the advisory databases to use
db-urls = ["https://github.com/rustsec/advisory-db"]
# The lint level for security vulnerabilities
vulnerability = "deny"
# The lint level for unmaintained crates
unmaintained = "warn"
# The lint level for crates that have been yanked from their source registry
yanked = "warn"
# The lint level for crates with security notices. Note that as of
# 2019-12-17 there are no security notice advisories in
# https://github.com/rustsec/advisory-db
notice = "warn"
# A list of advisory IDs to ignore. Note that ignored advisories will still
# output a note when they are encountered.
ignore = [
#"RUSTSEC-0000-0000",
]
# Threshold for security vulnerabilities, any vulnerability with a CVSS score
# lower than the range specified will be ignored. Note that ignored advisories
# will still output a note when they are encountered.
# * None - CVSS Score 0.0
# * Low - CVSS Score 0.1 - 3.9
# * Medium - CVSS Score 4.0 - 6.9
# * High - CVSS Score 7.0 - 8.9
# * Critical - CVSS Score 9.0 - 10.0
#severity-threshold =

# This section is considered when running `cargo deny check licenses`
# More documentation for the licenses section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
[licenses]
# The lint level for crates which do not have a detectable license
unlicensed = "deny"
# List of explicitly allowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
allow = [
#"MIT",
#"Apache-2.0",
#"Apache-2.0 WITH LLVM-exception",
]
# List of explicitly disallowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
deny = [
#"Nokia",
]
# Lint level for licenses considered copyleft
copyleft = "warn"
# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
# * both - The license will be approved if it is both OSI-approved *AND* FSF
# * either - The license will be approved if it is either OSI-approved *OR* FSF
# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
# * neither - This predicate is ignored and the default lint level is used
allow-osi-fsf-free = "neither"
# Lint level used when no other predicates are matched
# 1. License isn't in the allow or deny lists
# 2. License isn't copyleft
# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
default = "deny"
# The confidence threshold for detecting a license from license text.
# The higher the value, the more closely the license text must be to the
# canonical license text of a valid SPDX license file.
# [possible values: any between 0.0 and 1.0].
confidence-threshold = 0.8
# Allow 1 or more licenses on a per-crate basis, so that particular licenses
# aren't accepted for every possible crate as with the normal allow list
exceptions = [
# Each entry is the crate and version constraint, and its specific allow
# list
#{ allow = ["Zlib"], name = "adler32", version = "*" },
]

# Some crates don't have (easily) machine readable licensing information,
# adding a clarification entry for it allows you to manually specify the
# licensing information
#[[licenses.clarify]]
# The name of the crate the clarification applies to
#name = "ring"
# The optional version constraint for the crate
#version = "*"
# The SPDX expression for the license requirements of the crate
#expression = "MIT AND ISC AND OpenSSL"
# One or more files in the crate's source used as the "source of truth" for
# the license expression. If the contents match, the clarification will be used
# when running the license check, otherwise the clarification will be ignored
# and the crate will be checked normally, which may produce warnings or errors
# depending on the rest of your configuration
#license-files = [
# Each entry is a crate relative path, and the (opaque) hash of its contents
#{ path = "LICENSE", hash = 0xbd0eed23 }
#]

[licenses.private]
# If true, ignores workspace crates that aren't published, or are only
# published to private registries.
# To see how to mark a crate as unpublished (to the official registry),
# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field.
ignore = false
# One or more private registries that you might publish crates to, if a crate
# is only published to private registries, and ignore is true, the crate will
# not have its license(s) checked
registries = [
#"https://sekretz.com/registry
]

# This section is considered when running `cargo deny check bans`.
# More documentation about the 'bans' section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
[bans]
# Lint level for when multiple versions of the same crate are detected
multiple-versions = "warn"
# Lint level for when a crate version requirement is `*`
# * is for git rev too
wildcards = "allow"
# The graph highlighting used when creating dotgraphs for crates
# with multiple versions
# * lowest-version - The path to the lowest versioned duplicate is highlighted
# * simplest-path - The path to the version with the fewest edges is highlighted
# * all - Both lowest-version and simplest-path are used
highlight = "lowest-version"
# List of crates that are allowed. Use with care!
allow = [
#{ name = "ansi_term", version = "=0.11.0" },
]
# List of crates to deny
deny = [
# Each entry the name of a crate and a version range. If version is
# not specified, all versions will be matched.
#{ name = "ansi_term", version = "=0.11.0" },
#
# Wrapper crates can optionally be specified to allow the crate when it
# is a direct dependency of the otherwise banned crate
#{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
]
# Certain crates/versions that will be skipped when doing duplicate detection.
skip = [
# unfortunately substrate itself depends on several versions, to allow for it
{ name = "wasi", version = "=0.10.0+wasi-snapshot-preview1" },
{ name = "smallvec", version = "=0.6.14" },
{ name = "sha2", version = "=0.9.9" },
{ name = "semver", version = "=1.0.4" },
{ name = "rustc_version", version = "=0.4.0" },
{ name = "redox_syscall", version = "=0.2.10" },
{ name = "pbkdf2", version = "=0.8.0" },
{ name = "rand_xorshift", version = "=0.3.0" },
{ name = "rand_pcg", version = "=0.2.1" },
{ name = "opaque-debug", version = "=0.3.0" },
]
# Similarly to `skip` allows you to skip certain crates during duplicate
# detection. Unlike skip, it also includes the entire tree of transitive
# dependencies starting at the specified crate, up to a certain depth, which is
# by default infinite
skip-tree = [
#{ name = "ansi_term", version = "=0.11.0", depth = 20 },
]

# This section is considered when running `cargo deny check sources`.
# More documentation about the 'sources' section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
[sources]
# Lint level for what to happen when a crate from a crate registry that is not
# in the allow list is encountered
unknown-registry = "warn"
# Lint level for what to happen when a crate from a git repository that is not
# in the allow list is encountered
unknown-git = "warn"
# List of URLs for allowed crate registries. Defaults to the crates.io index
# if not specified. If it is specified but empty, no registries are allowed.
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
# List of URLs for allowed Git repositories
allow-git = []

[sources.allow-org]
# 1 or more github.com organizations to allow git sources for
github = [""]
# 1 or more gitlab.com organizations to allow git sources for
gitlab = [""]
# 1 or more bitbucket.org organizations to allow git sources for
bitbucket = [""]
2 changes: 1 addition & 1 deletion frame/bonded-finance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li
composable-traits = { path = "../../frame/composable-traits" }
proptest = "1.0"
proptest-derive = "0.3"
serde = { version = "1.0.124" }
serde = { version = "1.0.130" }
orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "63b32194e7b9aff6a6350d2d4434525de4eec7c1" }
pallet-vesting = { path = "../../frame/vesting" }
composable-tests-helpers = { path = "../composable-tests-helpers", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion frame/call-filter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"


[dependencies]
serde = { version = "1.0.124", optional = true }
serde = { version = "1.0.130", optional = true }
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
support = { package = "frame-support", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion frame/crowdloan-rewards/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package = "parity-scale-codec"
version = "2.0.0"

[dev-dependencies]
serde = "1.0.119"
serde = "1.0.130"
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
libsecp256k1 = { version = "0.7.0", default-features = false, features = [
"hmac",
Expand Down
2 changes: 1 addition & 1 deletion frame/democracy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
composable-traits = { default-features = false, path = "../composable-traits" }
serde = { version = "1.0.126", optional = true, features = ["derive"] }
serde = { version = "1.0.130", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive" ] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }
Expand Down
2 changes: 1 addition & 1 deletion frame/lending/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ log = { version = "0.4.14", default-features = false }
num-traits = { version = "0.2.14", default-features = false }
plotters = { version = "0.3.1", optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
serde = { version = '1.0.119' }
serde = { version = '1.0.130' }

[dev-dependencies]
hex-literal = "0.3.3"
Expand Down
8 changes: 4 additions & 4 deletions frame/lending/src/benchmarking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ benchmarks! {

withdraw_collateral {
let caller: T::AccountId = whitelisted_caller();
let market: MarketIndex = MarketIndex::new(1u32);
let amount: T::Balance = 1_000_000u64.into();
let market: MarketIndex = MarketIndex::new(1_u32);
let amount: T::Balance = 1_000_000_u64.into();
set_prices::<T>();
let (market, _vault_id) = create_market::<T>(caller.clone(), BTC, USDT);
<T as pallet::Config>::Currency::mint_into(USDT.into(), &caller, amount).unwrap();
Expand Down Expand Up @@ -208,12 +208,12 @@ benchmarks! {

handle_withdrawable {
let caller: T::AccountId = whitelisted_caller();
let (borrow_asset_id, collateral_asset_id) = (1u32, 2u32);
let (borrow_asset_id, collateral_asset_id) = (1_u32, 2u32);
set_price::<T>(borrow_asset_id.into(), u64::from(borrow_asset_id) * 10);
set_price::<T>(collateral_asset_id.into(), u64::from(collateral_asset_id) * 10);
let (market_id, vault_id) = create_market::<T>(caller.clone(), borrow_asset_id.into(), collateral_asset_id.into());
let market_config = Markets::<T>::try_get(market_id).unwrap();
let balance = 0u32.into();
let balance = 0_u32.into();
}: {
Lending::<T>::handle_withdrawable(&market_config, &caller, balance).unwrap()
}
Expand Down
6 changes: 4 additions & 2 deletions frame/lending/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Lending pallet
#![cfg_attr(
not(any(test, feature = "runtime-benchmarks")),
warn(
deny(
clippy::disallowed_method,
clippy::disallowed_type,
clippy::indexing_slicing,
Expand All @@ -12,7 +12,9 @@
)] // allow in tests
#![warn(clippy::unseparated_literal_suffix)]
#![cfg_attr(not(feature = "std"), no_std)]
#![warn(
#![deny(
unused_imports,
clippy::useless_conversion,
bad_style,
bare_trait_objects,
const_err,
Expand Down
26 changes: 2 additions & 24 deletions frame/lending/src/mocks/currency.rs
Original file line number Diff line number Diff line change
@@ -1,28 +1,6 @@
use crate::{self as pallet_lending, *};
use composable_traits::{
currency::DynamicCurrencyId,
defi::DeFiComposableConfig,
governance::{GovernanceRegistry, SignedRawOrigin},
};
use frame_support::{
ord_parameter_types, parameter_types,
traits::{Everything, OnFinalize, OnInitialize},
PalletId,
};
use frame_system::EnsureSignedBy;
use hex_literal::hex;
use once_cell::sync::Lazy;
use orml_traits::{parameter_type_with_key, GetByKey};
use composable_traits::currency::DynamicCurrencyId;
use scale_info::TypeInfo;
use sp_arithmetic::traits::Zero;
use sp_core::{sr25519::Signature, H256};
use sp_runtime::{
testing::{Header, TestXt},
traits::{
BlakeTwo256, ConvertInto, Extrinsic as ExtrinsicT, IdentifyAccount, IdentityLookup, Verify,
},
ArithmeticError, DispatchError,
};
use sp_runtime::{ArithmeticError, DispatchError};

#[derive(
PartialOrd,
Expand Down
Loading

0 comments on commit 641ffbf

Please sign in to comment.