Skip to content

chore: Unify usage of frame-contrib-traits #456

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
pandres95 merged 3 commits into from
Apr 24, 2025
Merged

chore: Unify usage of frame-contrib-traits #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9975844
chore(pallet-communities): replace mentions to `fc-traits-memberships…
pandres95 Apr 24, 2025
04f91dc
chore(kreivo-runtime): replace mentions to `fc-traits-*` with unified…
pandres95 Apr 24, 2025
ffd313e
chore: taplo fmt
pandres95 Apr 24, 2025
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
6 changes: 2 additions & 4 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 0 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ runtime-common = { default-features = false, path = "runtime/common" }

# Frame Contrib
frame-contrib-traits = { git = "https://github.com/virto-network/frame-contrib", default-features = false }
fc-traits-authn = { git = "https://github.com/virto-network/frame-contrib", default-features = false }
fc-traits-gas-tank = { git = "https://github.com/virto-network/frame-contrib", default-features = false }
fc-traits-memberships = { git = "https://github.com/virto-network/frame-contrib", default-features = false }
fc-traits-tracks = { git = "https://github.com/virto-network/frame-contrib", default-features = false }

pallet-gas-transaction-payment = { git = "https://github.com/virto-network/frame-contrib", default-features = false, package = "fc-pallet-gas-transaction-payment" }
pallet-listings = { git = "https://github.com/virto-network/frame-contrib", default-features = false, package = "fc-pallet-listings" }
Expand Down
32 changes: 12 additions & 20 deletions apis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,16 @@ virto-common = { workspace = true, optional = true, features = ["scale"] }
[features]
default = ["std", "runtime", "contract"]
std = [
"frame-support/std",
"frame-system/std",
"ink?/std",
"ink_env?/std",
"log?/std",
"pallet-contracts?/std",
"parity-scale-codec/std",
"scale-info/std",
"virto-common?/std",
"frame-contrib-traits/std"
]
runtime = [
"dep:frame-system",
"dep:log",
"dep:pallet-contracts",
]
contract = [
"dep:ink",
"dep:ink_env",
"dep:virto-common"
"frame-support/std",
"frame-system/std",
"ink?/std",
"ink_env?/std",
"log?/std",
"pallet-contracts?/std",
"parity-scale-codec/std",
"scale-info/std",
"virto-common?/std",
"frame-contrib-traits/std",
]
runtime = ["dep:frame-system", "dep:log", "dep:pallet-contracts"]
contract = ["dep:ink", "dep:ink_env", "dep:virto-common"]
8 changes: 2 additions & 6 deletions chain-spec-generator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,5 @@ kreivo-runtime = { workspace = true, default-features = true }
sc-chain-spec.workspace = true

[features]
runtime-benchmarks = [
"kreivo-runtime/runtime-benchmarks"
]
paseo = [
"kreivo-runtime/paseo"
]
runtime-benchmarks = ["kreivo-runtime/runtime-benchmarks"]
paseo = ["kreivo-runtime/paseo"]
9 changes: 2 additions & 7 deletions common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,8 @@ std = [
"sp-runtime?/std",
"xcm?/std",
]
scale = [
"dep:parity-scale-codec",
"dep:scale-info",
]
serde = [
"dep:serde",
]
scale = ["dep:parity-scale-codec", "dep:scale-info"]
serde = ["dep:serde"]
alloc = []
js = ["alloc", "wasm-bindgen"]
nightly = []
Expand Down
10 changes: 3 additions & 7 deletions pallets/communities/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
frame-benchmarking = { workspace = true, optional = true }
frame-support.workspace = true
frame-system.workspace = true
fc-traits-memberships.workspace = true
frame-contrib-traits.workspace = true

log.workspace = true

Expand All @@ -42,15 +42,11 @@ virto-common = { workspace = true, default-features = false, features = [

[features]
default = ["std", "xcm", "serde"]
serde = [
"dep:serde",
"scale-info/serde",
]
serde = ["dep:serde", "scale-info/serde"]
std = [
"frame-benchmarking?/std",
"frame-support/std",
"frame-system/std",
"fc-traits-memberships/std",
"log/std",
"pallet-assets/std",
"pallet-assets-freezer/std",
Expand Down Expand Up @@ -82,7 +78,7 @@ runtime-benchmarks = [
"pallet-referenda-tracks/runtime-benchmarks",
"pallet-scheduler/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"fc-traits-memberships/runtime-benchmarks",

]
try-runtime = [
"frame-support/try-runtime",
Expand Down
2 changes: 1 addition & 1 deletion pallets/communities/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use self::{
},
CommunityDecisionMethod, DecisionMethod, Event, FreezeReason, Pallet as Communities,
};
use fc_traits_memberships::{Inspect, Rank};
use frame_benchmarking::v2::*;
use frame_contrib_traits::memberships::{Inspect, Rank};
use frame_support::traits::{
fungible::{InspectFreeze, Mutate},
fungibles::Mutate as FunsMutate,
Expand Down
2 changes: 1 addition & 1 deletion pallets/communities/src/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;

use fc_traits_memberships::{GenericRank, Inspect, Rank};
use frame_contrib_traits::memberships::{GenericRank, Inspect, Rank};
use frame_support::{
dispatch::PostDispatchInfo,
fail,
Expand Down
2 changes: 1 addition & 1 deletion pallets/communities/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

use alloc::{boxed::Box, vec, vec::Vec};
use core::num::NonZeroU8;
use fc_traits_memberships::{self as membership, Inspect, Manager, Rank};
use frame_contrib_traits::memberships::{self as membership, Inspect, Manager, Rank};
use frame_support::{
dispatch::{DispatchResultWithPostInfo, GetDispatchInfo, PostDispatchInfo},
pallet_prelude::*,
Expand Down Expand Up @@ -154,7 +154,7 @@

const ONE: NonZeroU8 = NonZeroU8::MIN;

#[pallet::pallet]

Check warning on line 157 in pallets/communities/src/lib.rs

View workflow job for this annotation

GitHub Actions / clippy

using `map_err` over `inspect_err` 

warning: using `map_err` over `inspect_err`
   --> pallets/communities/src/lib.rs:157:12
    |
157 |     #[pallet::pallet]
    |               ^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_inspect
    = note: `#[warn(clippy::manual_inspect)]` on by default
help: try
    |
157 -     #[pallet::pallet]
157 +     #[pallet::&inspect_err]
    |
pub struct Pallet<T>(_);

/// Configure the pallet by specifying the parameters and types on which it
Expand Down Expand Up @@ -562,7 +562,7 @@
.saturating_add(di.weight);
(weight, di.class)
})]
pub fn dispatch_as_account(origin: OriginFor<T>, call: Box<RuntimeCallFor<T>>) -> DispatchResultWithPostInfo {

Check warning on line 565 in pallets/communities/src/lib.rs

View workflow job for this annotation

GitHub Actions / clippy

useless conversion to the same type: `frame_support::dispatch::PostDispatchInfo` 

warning: useless conversion to the same type: `frame_support::dispatch::PostDispatchInfo`
   --> pallets/communities/src/lib.rs:565:29
    |
565 |         pub fn dispatch_as_account(origin: OriginFor<T>, call: Box<RuntimeCallFor<T>>) -> DispatchResultWithPostInfo {
    |                                   ^ help: consider removing
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#useless_conversion

Check warning on line 565 in pallets/communities/src/lib.rs

View workflow job for this annotation

GitHub Actions / clippy

useless conversion to the same type: `sp_runtime::DispatchErrorWithPostInfo<frame_support::dispatch::PostDispatchInfo>` 

warning: useless conversion to the same type: `sp_runtime::DispatchErrorWithPostInfo<frame_support::dispatch::PostDispatchInfo>`
   --> pallets/communities/src/lib.rs:565:29
    |
565 |         pub fn dispatch_as_account(origin: OriginFor<T>, call: Box<RuntimeCallFor<T>>) -> DispatchResultWithPostInfo {
    |                                   ^ help: consider removing
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#useless_conversion
    = note: `#[warn(clippy::useless_conversion)]` on by default
let community_id = T::MemberMgmtOrigin::ensure_origin(origin)?;
Self::do_dispatch_as_community_account(&community_id, *call)
}
Expand Down
2 changes: 1 addition & 1 deletion pallets/communities/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use fc_traits_memberships::NonFungiblesMemberships;
use frame_contrib_traits::memberships::NonFungiblesMemberships;
use frame_support::{
derive_impl,
dispatch::DispatchResult,
Expand Down
2 changes: 1 addition & 1 deletion pallets/communities/src/origin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{
AccountIdOf, CommunityIdFor, Config, Info, Pallet,
};
use core::marker::PhantomData;
use fc_traits_memberships::{GenericRank, Inspect};
use frame_contrib_traits::memberships::{GenericRank, Inspect};
use frame_support::{
pallet_prelude::*,
traits::{EnsureOriginWithArg, MapSuccess, OriginTrait},
Expand Down
2 changes: 1 addition & 1 deletion pallets/communities/src/tests/governance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ mod vote {
}

mod membership {
use fc_traits_memberships::Inspect;
use frame_contrib_traits::memberships::Inspect;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion pallets/communities/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{CommunityDecisionMethod, Config};
use fc_traits_memberships::{Inspect, Rank};
use frame_contrib_traits::memberships::{Inspect, Rank};
use frame_support::pallet_prelude::*;
use frame_support::traits::{
fungible::{self, Inspect as FunInspect},
Expand Down
190 changes: 95 additions & 95 deletions runtime/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,105 +76,105 @@ parachains-common.workspace = true
[features]
default = ["std"]
std = [
"cumulus-pallet-aura-ext/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-session-benchmarking/std",
"cumulus-pallet-xcm/std",
"cumulus-pallet-xcmp-queue/std",
"cumulus-primitives-core/std",
"cumulus-primitives-timestamp/std",
"cumulus-primitives-utility/std",
"frame-benchmarking/std",
"frame-executive/std",
"frame-support/std",
"frame-system/std",
"frame-system-benchmarking/std",
"frame-system-rpc-runtime-api/std",
"frame-try-runtime/std",
"runtime-constants/std",
"log/std",
"pallet-assets/std",
"pallet-asset-tx-payment/std",
"pallet-aura/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-collator-selection/std",
"pallet-session/std",
"pallet-sudo/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
"pallet-xcm/std",
"pallet-treasury/std",
"parachain-info/std",
"parachains-common/std",
"parity-scale-codec/std",
"polkadot-core-primitives/std",
"polkadot-runtime-common/std",
"scale-info/std",
"sp-api/std",
"sp-block-builder/std",
"sp-consensus-aura/std",
"sp-core/std",
"sp-inherents/std",
"sp-offchain/std",
"sp-runtime/std",
"sp-session/std",
"sp-transaction-pool/std",
"sp-version/std",
"xcm/std",
"xcm-builder/std",
"xcm-executor/std",
"cumulus-pallet-aura-ext/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-session-benchmarking/std",
"cumulus-pallet-xcm/std",
"cumulus-pallet-xcmp-queue/std",
"cumulus-primitives-core/std",
"cumulus-primitives-timestamp/std",
"cumulus-primitives-utility/std",
"frame-benchmarking/std",
"frame-executive/std",
"frame-support/std",
"frame-system/std",
"frame-system-benchmarking/std",
"frame-system-rpc-runtime-api/std",
"frame-try-runtime/std",
"runtime-constants/std",
"log/std",
"pallet-assets/std",
"pallet-asset-tx-payment/std",
"pallet-aura/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-collator-selection/std",
"pallet-session/std",
"pallet-sudo/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
"pallet-xcm/std",
"pallet-treasury/std",
"parachain-info/std",
"parachains-common/std",
"parity-scale-codec/std",
"polkadot-core-primitives/std",
"polkadot-runtime-common/std",
"scale-info/std",
"sp-api/std",
"sp-block-builder/std",
"sp-consensus-aura/std",
"sp-core/std",
"sp-inherents/std",
"sp-offchain/std",
"sp-runtime/std",
"sp-session/std",
"sp-transaction-pool/std",
"sp-version/std",
"xcm/std",
"xcm-builder/std",
"xcm-executor/std",
]

runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
"cumulus-primitives-core/runtime-benchmarks",
"cumulus-primitives-utility/runtime-benchmarks",
"hex-literal",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"pallet-asset-tx-payment/runtime-benchmarks",
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-selection/runtime-benchmarks",
"pallet-sudo/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"pallet-treasury/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"parachains-common/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
"cumulus-primitives-core/runtime-benchmarks",
"cumulus-primitives-utility/runtime-benchmarks",
"hex-literal",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"pallet-asset-tx-payment/runtime-benchmarks",
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-selection/runtime-benchmarks",
"pallet-sudo/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"pallet-treasury/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"parachains-common/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
]

try-runtime = [
"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
"frame-executive/try-runtime",
"frame-system/try-runtime",
"frame-support/try-runtime",
"frame-try-runtime/try-runtime",
"pallet-aura/try-runtime",
"pallet-authorship/try-runtime",
"pallet-asset-tx-payment/try-runtime",
"pallet-assets/try-runtime",
"pallet-balances/try-runtime",
"pallet-collator-selection/try-runtime",
"pallet-session/try-runtime",
"pallet-sudo/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-treasury/try-runtime",
"pallet-xcm/try-runtime",
"parachain-info/try-runtime",
"polkadot-runtime-common/try-runtime",
"sp-runtime/try-runtime",
"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
"frame-executive/try-runtime",
"frame-system/try-runtime",
"frame-support/try-runtime",
"frame-try-runtime/try-runtime",
"pallet-aura/try-runtime",
"pallet-authorship/try-runtime",
"pallet-asset-tx-payment/try-runtime",
"pallet-assets/try-runtime",
"pallet-balances/try-runtime",
"pallet-collator-selection/try-runtime",
"pallet-session/try-runtime",
"pallet-sudo/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-treasury/try-runtime",
"pallet-xcm/try-runtime",
"parachain-info/try-runtime",
"polkadot-runtime-common/try-runtime",
"sp-runtime/try-runtime",
]
Loading
Loading