chore: add pre-push hooks

Author: saiintbrisson

flake.nix

@@ -51,6 +51,7 @@
           pkgs.python310
           # Subxt CLI for metadata handling
           pkgs.subxt
+          pkgs.cargo-nextest
           # # Code coverage tool
           # pkgs.cargo-llvm-cov # marked as broken
         ];
@@ -59,7 +60,17 @@
         checks = pkgs.mkShell {
           pre-commit-check = pre-commit-hooks.lib.${system}.run {
             src = ./.;
-            hooks = { rustfmt.enable = true; };
+            hooks = {
+               rustfmt.enable = true;
+
+               push = {
+                 enable = true;
+                 name = "Tests & Stuff";
+                 entry = "just test";
+                 pass_filenames = false;
+                 stages = ["pre-push"];
+               };
+            };
           };
         };
 

justfile

@@ -10,11 +10,11 @@ build-testnet:
 
 # Development
 
-check:
+check: fmt
   cargo clippy --tests
 
-test:
-  cargo test
+test: check
+  cargo nextest run
 
 fmt:
   cargo fmt

pallets/faucet/tests/faucet.rs

@@ -232,7 +232,7 @@ impl pallet_governance::Config for Test {
 
 parameter_types! {
     pub const PermissionPalletId: PalletId = PalletId(*b"torusper");
-    pub const MaxTargetsPerPermission: u32 = 100;
+    pub const MaxRecipientsPerPermission: u32 = 100;
     pub const MaxStreamsPerPermission: u32 = 100;
     pub const MaxRevokersPerPermission: u32 = 10;
     pub const MaxControllersPerPermission: u32 = 10;
@@ -250,7 +250,7 @@ impl pallet_permission0::Config for Test {
 
     type Torus = Torus0;
 
-    type MaxTargetsPerPermission = MaxTargetsPerPermission;
+    type MaxRecipientsPerPermission = MaxRecipientsPerPermission;
 
     type MaxStreamsPerPermission = MaxStreamsPerPermission;
 

pallets/permission0/src/ext/emission_impl.rs

@@ -17,7 +17,7 @@ use polkadot_sdk::{
     polkadot_sdk_frame::prelude::{BlockNumberFor, OriginFor},
     sp_core::{Get, TryCollect},
     sp_runtime::{
-        BoundedBTreeMap, DispatchError, Percent, Vec,
+        BoundedBTreeMap, BoundedBTreeSet, DispatchError, Percent, Vec,
         traits::{CheckedAdd, Saturating, Zero},
     },
 };
@@ -113,7 +113,7 @@ impl<T: Config>
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn delegate_emission_permission_impl<T: Config>(
     delegator: T::AccountId,
-    recipients: BoundedBTreeMap<T::AccountId, u16, T::MaxTargetsPerPermission>,
+    recipients: BoundedBTreeMap<T::AccountId, u16, T::MaxRecipientsPerPermission>,
     allocation: EmissionAllocation<T>,
     distribution: DistributionControl<T>,
     duration: PermissionDuration<T>,
@@ -160,8 +160,8 @@ pub(crate) fn delegate_emission_permission_impl<T: Config>(
         allocation: allocation.clone(),
         distribution,
         accumulating: true, // Start with accumulation enabled by default
-        recipient_manager,
-        weight_setter,
+        recipient_managers: validate_emission_managers::<T>(&delegator, recipient_manager)?,
+        weight_setters: validate_emission_managers::<T>(&delegator, weight_setter)?,
     });
 
     let permission_id = generate_permission_id::<T>(&delegator, &scope)?;
@@ -317,7 +317,7 @@ pub fn toggle_permission_accumulation_impl<T: Config>(
 pub(crate) fn update_emission_permission<T: Config>(
     origin: OriginFor<T>,
     permission_id: PermissionId,
-    new_recipients: Option<BoundedBTreeMap<T::AccountId, u16, T::MaxTargetsPerPermission>>,
+    new_recipients: Option<BoundedBTreeMap<T::AccountId, u16, T::MaxRecipientsPerPermission>>,
     new_streams: Option<BoundedBTreeMap<StreamId, Percent, T::MaxStreamsPerPermission>>,
     new_distribution_control: Option<DistributionControl<T>>,
     new_recipient_manager: Option<Option<T::AccountId>>,
@@ -338,16 +338,8 @@ pub(crate) fn update_emission_permission<T: Config>(
     };
 
     let allowed_delegator = permission.delegator == caller;
-    let allowed_weights = allowed_delegator
-        || scope
-            .weight_setter
-            .as_ref()
-            .is_some_and(|weight_setter| weight_setter == &caller);
-    let allowed_recipients = allowed_delegator
-        || scope
-            .recipient_manager
-            .as_ref()
-            .is_some_and(|recipient_manager| recipient_manager == &caller);
+    let allowed_weights = allowed_delegator || scope.weight_setters.contains(&caller);
+    let allowed_recipients = allowed_delegator || scope.recipient_managers.contains(&caller);
 
     if !allowed_delegator && !allowed_weights && !allowed_recipients {
         return Err(Error::<T>::NotAuthorizedToEdit.into());
@@ -421,12 +413,14 @@ pub(crate) fn update_emission_permission<T: Config>(
 
     if let Some(new_recipient_manager) = new_recipient_manager {
         ensure!(allowed_delegator, Error::<T>::NotAuthorizedToEdit);
-        scope.recipient_manager = new_recipient_manager;
+        scope.recipient_managers =
+            validate_emission_managers::<T>(&permission.delegator, new_recipient_manager)?;
     }
 
     if let Some(new_weight_setter) = new_weight_setter {
         ensure!(allowed_delegator, Error::<T>::NotAuthorizedToEdit);
-        scope.weight_setter = new_weight_setter;
+        scope.weight_setters =
+            validate_emission_managers::<T>(&permission.delegator, new_weight_setter)?;
     }
 
     permission.scope = PermissionScope::Emission(scope);
@@ -435,9 +429,21 @@ pub(crate) fn update_emission_permission<T: Config>(
     Ok(())
 }
 
+fn validate_emission_managers<T: Config>(
+    delegator: &T::AccountId,
+    entry: Option<T::AccountId>,
+) -> Result<BoundedBTreeSet<T::AccountId, T::MaxControllersPerPermission>, DispatchError> {
+    let mut set = BoundedBTreeSet::new();
+    let _ = set.try_insert(delegator.clone());
+    if let Some(entry) = entry {
+        let _ = set.try_insert(entry);
+    }
+    Ok(set)
+}
+
 fn validate_emission_permission_recipients<T: Config>(
     delegator: &T::AccountId,
-    recipients: &BoundedBTreeMap<T::AccountId, u16, T::MaxTargetsPerPermission>,
+    recipients: &BoundedBTreeMap<T::AccountId, u16, T::MaxRecipientsPerPermission>,
 ) -> DispatchResult {
     ensure!(!recipients.is_empty(), Error::<T>::NoTargetsSpecified);
 
@@ -452,6 +458,7 @@ fn validate_emission_permission_recipients<T: Config>(
 
     Ok(())
 }
+
 fn validate_emission_permission_streams<T: Config>(
     streams: &BoundedBTreeMap<StreamId, Percent, T::MaxStreamsPerPermission>,
     delegator: &T::AccountId,

pallets/permission0/src/lib.rs

@@ -66,7 +66,7 @@ pub mod pallet {
 
         /// Maximum number of targets per permission.
         #[pallet::constant]
-        type MaxTargetsPerPermission: Get<u32>;
+        type MaxRecipientsPerPermission: Get<u32>;
 
         /// Maximum number of delegated streams per permission.
         #[pallet::constant]
@@ -112,7 +112,7 @@ pub mod pallet {
         _,
         Identity,
         (T::AccountId, T::AccountId),
-        BoundedBTreeSet<PermissionId, T::MaxTargetsPerPermission>,
+        BoundedBTreeSet<PermissionId, T::MaxRecipientsPerPermission>,
         ValueQuery,
     >;
 
@@ -122,7 +122,7 @@ pub mod pallet {
         _,
         Identity,
         T::AccountId,
-        BoundedBTreeSet<PermissionId, T::MaxTargetsPerPermission>,
+        BoundedBTreeSet<PermissionId, T::MaxRecipientsPerPermission>,
         ValueQuery,
     >;
 
@@ -132,7 +132,7 @@ pub mod pallet {
         _,
         Identity,
         T::AccountId,
-        BoundedBTreeSet<PermissionId, T::MaxTargetsPerPermission>,
+        BoundedBTreeSet<PermissionId, T::MaxRecipientsPerPermission>,
         ValueQuery,
     >;
 
@@ -316,6 +316,8 @@ pub mod pallet {
         NotEnoughInstances,
         /// Too many children for a permission.
         TooManyChildren,
+        /// Emission managers must have up to two entries and always contain the delegator,
+        InvalidEmissionManagers,
         /// Revocation terms are too strong for a permission re-delegation.
         RevocationTermsTooStrong,
         /// Too many curator permissions being delegated in a single permission.
@@ -338,7 +340,7 @@ pub mod pallet {
         #[pallet::weight(T::WeightInfo::delegate_emission_permission())]
         pub fn delegate_emission_permission(
             origin: OriginFor<T>,
-            recipients: BoundedBTreeMap<T::AccountId, u16, T::MaxTargetsPerPermission>,
+            recipients: BoundedBTreeMap<T::AccountId, u16, T::MaxRecipientsPerPermission>,
             allocation: EmissionAllocation<T>,
             distribution: DistributionControl<T>,
             duration: PermissionDuration<T>,
@@ -491,7 +493,9 @@ pub mod pallet {
         pub fn update_emission_permission(
             origin: OriginFor<T>,
             permission_id: PermissionId,
-            new_recipients: Option<BoundedBTreeMap<T::AccountId, u16, T::MaxTargetsPerPermission>>,
+            new_recipients: Option<
+                BoundedBTreeMap<T::AccountId, u16, T::MaxRecipientsPerPermission>,
+            >,
             new_streams: Option<BoundedBTreeMap<StreamId, Percent, T::MaxStreamsPerPermission>>,
             new_distribution_control: Option<DistributionControl<T>>,
             new_recipient_manager: Option<Option<T::AccountId>>,

pallets/permission0/src/migrations.rs

@@ -1,6 +1,7 @@
 pub mod v6 {
     use polkadot_sdk::{
         frame_support::{migrations::VersionedMigration, traits::UncheckedOnRuntimeUpgrade},
+        sp_runtime::BoundedBTreeSet,
         sp_tracing::{error, info, warn},
         sp_weights::Weight,
     };
@@ -36,7 +37,7 @@ pub mod v6 {
         pub struct OldEmissionScope<T: Config> {
             pub allocation: EmissionAllocation<T>,
             pub distribution: DistributionControl<T>,
-            pub targets: BoundedBTreeMap<T::AccountId, u16, T::MaxTargetsPerPermission>,
+            pub targets: BoundedBTreeMap<T::AccountId, u16, T::MaxRecipientsPerPermission>,
             pub accumulating: bool,
         }
 
@@ -113,14 +114,17 @@ pub mod v6 {
                             permission_id,
                         );
 
+                        let mut managers = BoundedBTreeSet::new();
+                        let _ = managers.try_insert(old_contract.delegator.clone());
+
                         let new_emission = EmissionScope::<T> {
                             recipients: old_emission.targets, // Field renamed from targets to recipients
                             allocation: old_emission.allocation,
                             distribution: old_emission.distribution,
                             accumulating: old_emission.accumulating,
                             // New manager fields introduced in v6
-                            recipient_manager: None,
-                            weight_setter: None,
+                            recipient_managers: managers.clone(),
+                            weight_setters: managers,
                         };
 
                         // Add new indices for all emission targets

pallets/permission0/src/permission/emission.rs

@@ -17,7 +17,7 @@ pub type StreamId = H256;
 #[scale_info(skip_type_params(T))]
 pub struct EmissionScope<T: Config> {
     /// Recipients of the emissions and its weights
-    pub recipients: BoundedBTreeMap<T::AccountId, u16, T::MaxTargetsPerPermission>,
+    pub recipients: BoundedBTreeMap<T::AccountId, u16, T::MaxRecipientsPerPermission>,
     /// What portion of emissions this permission applies to
     pub allocation: EmissionAllocation<T>,
     /// Distribution control parameters
@@ -26,10 +26,10 @@ pub struct EmissionScope<T: Config> {
     pub accumulating: bool,
     /// An account responsible for managing the recipients to this permission's streams.
     /// If left empty, the delegator will be
-    pub recipient_manager: Option<T::AccountId>,
+    pub recipient_managers: BoundedBTreeSet<T::AccountId, T::MaxControllersPerPermission>,
     /// An account responsible for updating the weights of existing recipients. Useful
     /// for third-party agents to manage how the streams will be distributed.
-    pub weight_setter: Option<T::AccountId>,
+    pub weight_setters: BoundedBTreeSet<T::AccountId, T::MaxControllersPerPermission>,
 }
 
 impl<T: Config> EmissionScope<T> {

pallets/permission0/tests/namespace.rs

@@ -36,7 +36,7 @@ fn get_last_delegated_permission_id(delegator: AccountId) -> PermissionId {
                 None
             }
         })
-        .last() // Get most recent
+        .next_back() // Get most recent
         .expect("No PermissionDelegated event found")
 }
 
@@ -80,7 +80,7 @@ fn get_permission_id_for_recipient(recipient: AccountId) -> PermissionId {
             _ => continue,
         }
     }
-    panic!("No permission found for recipient: {:?}", recipient);
+    panic!("No permission found for recipient: {recipient:?}");
 }
 
 fn register_agent(id: AccountId) {