Bump pallet-transaction-pause

This includes the deprecation of `Balances::transfer` from paritytech/polkadot-sdk#1226.
entropyxyz · Jan 19, 2024 · 855e07f · 855e07f
1 parent ee7341c
commit 855e07f
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/transaction-pause/Cargo.toml b/pallets/transaction-pause/Cargo.toml
@@ -9,20 +9,20 @@ edition   ='2021'
 publish   =false
 
 [dependencies]
-codec             ={ package="parity-scale-codec", version="3.6.3", default-features=false }
+codec             ={ package="parity-scale-codec", version="3.6.3", default-features=false, features =["derive"] }
 scale-info        ={ version="2.1", default-features=false, features=["derive"] }
-sp-runtime        ={ git="https://github.com/paritytech/substrate", branch="polkadot-v1.0.0", default-features=false }
-frame-benchmarking={ git="https://github.com/paritytech/substrate", branch="polkadot-v1.0.0", optional=true, default-features=false }
-frame-support     ={ git="https://github.com/paritytech/substrate", branch="polkadot-v1.0.0", default-features=false }
-frame-system      ={ git="https://github.com/paritytech/substrate", branch="polkadot-v1.0.0", default-features=false }
-sp-std            ={ git="https://github.com/paritytech/substrate", branch="polkadot-v1.0.0", default-features=false }
+sp-runtime    ={ version="28.0.0", default-features=false }
+frame-benchmarking = { default-features = false, optional = true , version = "25.0.0" }
+frame-support = { default-features = false , version = "25.0.0" }
+frame-system = { default-features = false , version = "25.0.0" }
+sp-std        ={ package="sp-std", version="12.0.0", default-features=false }
 
 [dev-dependencies]
-pallet-balances={ git="https://github.com/paritytech/substrate", branch="polkadot-v1.0.0" }
+pallet-balances = { version = "25.0.0" }
 pallet-programs={ version="0.0.9", default-features=false, path="../programs" }
 smallvec       ="1.4.1"
-sp-core        ={ version="21.0.0", git="https://github.com/paritytech/substrate", branch="polkadot-v1.0.0" }
-sp-io          ={ git="https://github.com/paritytech/substrate", branch="polkadot-v1.0.0" }
+sp-core       ={ version="25.0.0" }
+sp-io = { version = "27.0.0" }
 
 [features]
 default=["std"]

diff --git a/pallets/transaction-pause/src/lib.rs b/pallets/transaction-pause/src/lib.rs
@@ -20,9 +20,8 @@
 #![allow(clippy::unused_unit)]
 
 use frame_support::{
-    dispatch::{CallMetadata, GetCallMetadata},
     pallet_prelude::*,
-    traits::{Contains, PalletInfoAccess},
+    traits::{CallMetadata, Contains, GetCallMetadata, PalletInfoAccess},
     transactional,
 };
 use frame_system::pallet_prelude::*;

diff --git a/pallets/transaction-pause/src/mock.rs b/pallets/transaction-pause/src/mock.rs
@@ -77,6 +77,7 @@ impl pallet_balances::Config for Runtime {
     type ReserveIdentifier = [u8; 8];
     type RuntimeEvent = RuntimeEvent;
     type RuntimeHoldReason = RuntimeHoldReason;
+    type RuntimeFreezeReason = RuntimeFreezeReason;
     type WeightInfo = ();
 }
 

diff --git a/pallets/transaction-pause/src/tests.rs b/pallets/transaction-pause/src/tests.rs
@@ -27,7 +27,10 @@ use sp_runtime::traits::BadOrigin;
 use super::*;
 
 const BALANCE_TRANSFER: &<Runtime as frame_system::Config>::RuntimeCall =
-    &mock::RuntimeCall::Balances(pallet_balances::Call::transfer { dest: ALICE, value: 10 });
+    &mock::RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death {
+        dest: ALICE,
+        value: 10,
+    });
 
 #[test]
 fn pause_transaction_work() {
@@ -38,28 +41,34 @@ fn pause_transaction_work() {
             TransactionPause::pause_transaction(
                 RuntimeOrigin::signed(5),
                 b"Balances".to_vec(),
-                b"transfer".to_vec()
+                b"transfer_allow_death".to_vec()
             ),
             BadOrigin
         );
 
         assert_eq!(
-            TransactionPause::paused_transactions((b"Balances".to_vec(), b"transfer".to_vec())),
+            TransactionPause::paused_transactions((
+                b"Balances".to_vec(),
+                b"transfer_allow_death".to_vec()
+            )),
             None
         );
         assert_ok!(TransactionPause::pause_transaction(
             RuntimeOrigin::signed(1),
             b"Balances".to_vec(),
-            b"transfer".to_vec()
+            b"transfer_allow_death".to_vec()
         ));
         System::assert_last_event(RuntimeEvent::TransactionPause(
             crate::Event::TransactionPaused {
                 pallet_name_bytes: b"Balances".to_vec(),
-                function_name_bytes: b"transfer".to_vec(),
+                function_name_bytes: b"transfer_allow_death".to_vec(),
             },
         ));
         assert_eq!(
-            TransactionPause::paused_transactions((b"Balances".to_vec(), b"transfer".to_vec())),
+            TransactionPause::paused_transactions((
+                b"Balances".to_vec(),
+                b"transfer_allow_death".to_vec()
+            )),
             Some(())
         );
 
@@ -95,35 +104,41 @@ fn unpause_transaction_work() {
         assert_ok!(TransactionPause::pause_transaction(
             RuntimeOrigin::signed(1),
             b"Balances".to_vec(),
-            b"transfer".to_vec()
+            b"transfer_allow_death".to_vec()
         ));
         assert_eq!(
-            TransactionPause::paused_transactions((b"Balances".to_vec(), b"transfer".to_vec())),
+            TransactionPause::paused_transactions((
+                b"Balances".to_vec(),
+                b"transfer_allow_death".to_vec()
+            )),
             Some(())
         );
 
         assert_noop!(
             TransactionPause::unpause_transaction(
                 RuntimeOrigin::signed(5),
                 b"Balances".to_vec(),
-                b"transfer".to_vec()
+                b"transfer_allow_death".to_vec()
             ),
             BadOrigin
         );
 
         assert_ok!(TransactionPause::unpause_transaction(
             RuntimeOrigin::signed(1),
             b"Balances".to_vec(),
-            b"transfer".to_vec()
+            b"transfer_allow_death".to_vec()
         ));
         System::assert_last_event(RuntimeEvent::TransactionPause(
             crate::Event::TransactionUnpaused {
                 pallet_name_bytes: b"Balances".to_vec(),
-                function_name_bytes: b"transfer".to_vec(),
+                function_name_bytes: b"transfer_allow_death".to_vec(),
             },
         ));
         assert_eq!(
-            TransactionPause::paused_transactions((b"Balances".to_vec(), b"transfer".to_vec())),
+            TransactionPause::paused_transactions((
+                b"Balances".to_vec(),
+                b"transfer_allow_death".to_vec()
+            )),
             None
         );
     });
@@ -141,7 +156,7 @@ fn paused_transaction_filter_work() {
         assert_ok!(TransactionPause::pause_transaction(
             RuntimeOrigin::signed(1),
             b"Balances".to_vec(),
-            b"transfer".to_vec()
+            b"transfer_allow_death".to_vec()
         ));
         assert_ok!(TransactionPause::pause_transaction(
             RuntimeOrigin::signed(1),
@@ -154,7 +169,7 @@ fn paused_transaction_filter_work() {
         assert_ok!(TransactionPause::unpause_transaction(
             RuntimeOrigin::signed(1),
             b"Balances".to_vec(),
-            b"transfer".to_vec()
+            b"transfer_allow_death".to_vec()
         ));
         assert_ok!(TransactionPause::unpause_transaction(
             RuntimeOrigin::signed(1),