propose_call to submit_call

kabocha-network · Jul 11, 2023 · 1993848 · 1993848
1 parent 27b8e2b
commit 1993848
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ The Supersig pallet provide function for:
   /!!\ note of caution /!!\ the creator of the supersig will NOT be added by default, he will
   have to pass his adress into the list of added users.
 
-- `propose_call` - make a proposal on the specified supersig. an amount corresponding to the
+- `submit_call` - make a proposal on the specified supersig. an amount corresponding to the
   length of the encoded call will be reserved.
 
 - `approve_call` - give a positive vote to a call. if the number of vote >= SimpleMajority, the

diff --git a/src/benchmarking.rs b/src/benchmarking.rs
@@ -33,7 +33,7 @@ benchmarks! {
 		assert_eq!(Pallet::<T>::nonce_supersig(), 1);
 	}
 
-	propose_call {
+	submit_call {
 		let z in 0 .. 100_000;
 		let call = frame_system::Call::remark {
 			remark: vec![0; z as usize]
@@ -79,7 +79,7 @@ benchmarks! {
 			Pallet::<T>::create_supersig(RawOrigin::Signed(alice.clone()).into(),
 			members)
 		);
-		assert_ok!(Pallet::<T>::propose_call(RawOrigin::Signed(alice).into(), supersig_id.clone(), Box::new(call)));
+		assert_ok!(Pallet::<T>::submit_call(RawOrigin::Signed(alice).into(), supersig_id.clone(), Box::new(call)));
 
 	}: _(RawOrigin::Signed(bob.clone()), supersig_id, 0)
 	verify {
@@ -107,7 +107,7 @@ benchmarks! {
 			Pallet::<T>::create_supersig(RawOrigin::Signed(alice.clone()).into(),
 			members)
 		);
-		assert_ok!(Pallet::<T>::propose_call(RawOrigin::Signed(alice.clone()).into(), supersig_id.clone(), Box::new(call)));
+		assert_ok!(Pallet::<T>::submit_call(RawOrigin::Signed(alice.clone()).into(), supersig_id.clone(), Box::new(call)));
 		assert_ok!(Pallet::<T>::approve_call(RawOrigin::Signed(alice.clone()).into(), supersig_id.clone(), 0));
 	}: _(RawOrigin::Signed(alice.clone()), supersig_id, 0)
 	verify {

diff --git a/src/tests/approve_call.rs b/src/tests/approve_call.rs
@@ -27,7 +27,7 @@ fn approve_call() {
 		let call = frame_system::Call::remark {
 			remark: "test".into(),
 		};
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())
@@ -76,7 +76,7 @@ fn approve_call_until_threshold() {
 			value: 100_000,
 		};
 
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())
@@ -153,7 +153,7 @@ fn approve_call_as_master() {
 			value: 100_000,
 		};
 
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())
@@ -228,7 +228,7 @@ fn approve_failing_call_as_master() {
 			value: 10_000_000,
 		};
 
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())
@@ -284,7 +284,7 @@ fn approve_supersig_doesnt_exist() {
 		let call = frame_system::Call::remark {
 			remark: "test".into(),
 		};
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(CHARLIE()).into(),
 			supersig_account,
 			Box::new(call.into())
@@ -318,7 +318,7 @@ fn user_already_voted() {
 		let call = frame_system::Call::remark {
 			remark: "test".into(),
 		};
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(CHARLIE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())
@@ -352,7 +352,7 @@ fn approve_not_a_member() {
 		let call = frame_system::Call::remark {
 			remark: "test".into(),
 		};
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())

diff --git a/src/tests/delete_supersig.rs b/src/tests/delete_supersig.rs
@@ -77,7 +77,7 @@ fn delete_supersig_with_call() {
 			supersig_account.clone(),
 			amount
 		));
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(BOB()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())
@@ -180,7 +180,7 @@ fn cannot_liquidate_supersig() {
 			keep_alive: false,
 		};
 
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())

diff --git a/src/tests/mod.rs b/src/tests/mod.rs
@@ -6,7 +6,7 @@ mod leave_supersig;
 mod remove_call;
 mod remove_members;
 mod rpc_calls;
-mod propose_call;
+mod submit_call;
 
 pub mod helper;
 pub mod mock;
diff --git a/src/tests/propose_call.rs b/src/tests/propose_call.rs
@@ -6,7 +6,7 @@ use frame_system::RawOrigin;
 pub use sp_std::boxed::Box;
 
 #[test]
-fn propose_calls() {
+fn submit_calls() {
 	ExtBuilder::default().balances(vec![]).build().execute_with(|| {
 		assert_ok!(Supersig::create_supersig(
 			RawOrigin::Signed(ALICE()).into(),
@@ -33,7 +33,7 @@ fn propose_calls() {
 		}
 		.into();
 
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.clone())
@@ -50,7 +50,7 @@ fn propose_calls() {
 				ALICE()
 			))
 		);
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(BOB()).into(),
 			supersig_account.clone(),
 			Box::new(call1)
@@ -64,7 +64,7 @@ fn propose_calls() {
 				BOB()
 			))
 		);
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(CHARLIE()).into(),
 			supersig_account.clone(),
 			Box::new(call2)
@@ -96,7 +96,7 @@ fn submit_supersig_doesnt_exist() {
 		}
 		.into();
 		assert_noop!(
-			Supersig::propose_call(
+			Supersig::submit_call(
 				RawOrigin::Signed(CHARLIE()).into(),
 				bad_supersig_account,
 				Box::new(call)
@@ -106,7 +106,7 @@ fn submit_supersig_doesnt_exist() {
 	})
 }
 #[test]
-fn propose_call_data_too_large() {
+fn submit_call_data_too_large() {
     ExtBuilder::default().balances(vec![]).build().execute_with(|| {
 		assert_ok!(Supersig::create_supersig(
 			RawOrigin::Signed(ALICE()).into(),
@@ -124,7 +124,7 @@ fn propose_call_data_too_large() {
         let call: RuntimeCall = frame_system::Call::remark { remark: large_data.into() }.into();
 
         assert_noop!(
-            Supersig::propose_call(
+            Supersig::submit_call(
                 RawOrigin::Signed(ALICE()).into(),
                 supersig_account.clone(),
                 Box::new(call)
@@ -165,7 +165,7 @@ fn test_live_proposals_limit() {
 					remark: "test".into(),
 				}
 				.into();
-				Supersig::propose_call(
+				Supersig::submit_call(
 					RawOrigin::Signed(ALICE()).into(),
 					supersig_account.clone(),
 					Box::new(call.clone())
@@ -177,7 +177,7 @@ fn test_live_proposals_limit() {
 			}	
 			.into();
 			assert_noop!(
-				Supersig::propose_call(
+				Supersig::submit_call(
 					RawOrigin::Signed(ALICE()).into(),
 					supersig_account.clone(),
 					Box::new(call.clone())
@@ -212,7 +212,7 @@ fn test_active_proposals_decrement_on_approve() {
 				remark: "test".into(),
 			}	
 			.into();
-			assert_ok!(Supersig::propose_call(
+			assert_ok!(Supersig::submit_call(
 				RawOrigin::Signed(BOB()).into(),
 				supersig_account.clone(),
 				Box::new(call)
@@ -231,7 +231,7 @@ fn test_active_proposals_decrement_on_approve() {
 }
 
 #[test]
-	fn test_propose_call_max_active_proposals() {
+	fn test_submit_call_max_active_proposals() {
 		ExtBuilder::default()
 		.balances(vec![])
 		.build()
@@ -252,7 +252,7 @@ fn test_active_proposals_decrement_on_approve() {
 			.into();
 			// propose 3 calls
 			for i in 1..3 {
-					Supersig::propose_call(
+					Supersig::submit_call(
 						RawOrigin::Signed(ALICE()).into(), 
 						supersig_account.clone(), 
 						Box::new(call.clone()),
@@ -265,7 +265,7 @@ fn test_active_proposals_decrement_on_approve() {
 					supersig_account.clone(), 
 					0
 				));
-				assert_ok!(Supersig::propose_call(
+				assert_ok!(Supersig::submit_call(
 					RawOrigin::Signed(ALICE()).into(), 
 					supersig_account.clone(), 
 					Box::new(call.clone()),
@@ -274,7 +274,7 @@ fn test_active_proposals_decrement_on_approve() {
 	}
 
 	#[test]
-	fn test_propose_call_active_proposals_multiple_accounts() {
+	fn test_submit_call_active_proposals_multiple_accounts() {
 		ExtBuilder::default()
 			.balances(vec![])
 			.build()
@@ -337,30 +337,30 @@ fn test_active_proposals_decrement_on_approve() {
 				.into();
 
 				// propose a call with each account
-				assert_ok!(Supersig::propose_call(
+				assert_ok!(Supersig::submit_call(
 					RawOrigin::Signed(ALICE()).into(), 
 					supersig_account.clone(), 
 					Box::new(call.clone()),
 					));
-				assert_ok!(Supersig::propose_call(
+				assert_ok!(Supersig::submit_call(
 					RawOrigin::Signed(BOB()).into(), 
 					supersig_account_1.clone(), 
 					Box::new(call.clone()),
 				));
-				assert_ok!(Supersig::propose_call(
+				assert_ok!(Supersig::submit_call(
 					RawOrigin::Signed(BOB()).into(), 
 					supersig_account_2.clone(), 
 					Box::new(call.clone()),
 				));
-				assert_ok!(Supersig::propose_call(
+				assert_ok!(Supersig::submit_call(
 					RawOrigin::Signed(BOB()).into(), 
 					supersig_account_3.clone(), 
 					Box::new(call.clone()),
 				));
 
 				// try to propose a fifth call just to show that MaxCallPerAccount is per account not the total chain.
 				assert_ok!(
-					Supersig::propose_call(
+					Supersig::submit_call(
 						RawOrigin::Signed(ALICE()).into(), 
 						supersig_account_4.clone(), 
 						Box::new(call.clone()),
@@ -396,13 +396,13 @@ fn test_active_proposals_decrement_on_approve() {
 
 		// Test that we cannot propose more than `MaxCallsPerAccount`
 		for i in 1..=3 {
-			Supersig::propose_call(
+			Supersig::submit_call(
 				RawOrigin::Signed(ALICE()).into(), 
 				supersig_account.clone(), 
 				Box::new(call.clone()),
 			);
 			// assert_noop!(
-			// 	Supersig::propose_call(
+			// 	Supersig::submit_call(
 			// 		RawOrigin::Signed(ALICE()).into(),
 			// 		supersig_account.clone(), 
 			// 		Box::new(call.clone()),
@@ -425,7 +425,7 @@ fn test_active_proposals_decrement_on_approve() {
 				2
 			);
 
-			assert_ok!(Supersig::propose_call(
+			assert_ok!(Supersig::submit_call(
 				RawOrigin::Signed(ALICE()).into(), 
 					supersig_account.clone(), 
 					Box::new(call.clone()),

diff --git a/src/tests/remove_call.rs b/src/tests/remove_call.rs
@@ -22,7 +22,7 @@ fn remove_call() {
 		let call = frame_system::Call::remark {
 			remark: "test".into(),
 		};
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())
@@ -62,7 +62,7 @@ fn non_allowed_remove_call() {
 		let call = frame_system::Call::remark {
 			remark: "test".into(),
 		};
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())
@@ -92,7 +92,7 @@ fn remove_unknown_call() {
 		let call = frame_system::Call::remark {
 			remark: "test".into(),
 		};
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.into())

diff --git a/src/tests/rpc_calls.rs b/src/tests/rpc_calls.rs
@@ -85,13 +85,13 @@ fn get_proposals() {
 		}
 		.into();
 
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.clone())
 		));
 
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.clone())
@@ -145,7 +145,7 @@ fn get_proposal_state() {
 			Error::<Test>::CallNotFound
 		);
 
-		assert_ok!(Supersig::propose_call(
+		assert_ok!(Supersig::submit_call(
 			RawOrigin::Signed(ALICE()).into(),
 			supersig_account.clone(),
 			Box::new(call.clone())

diff --git a/src/weights.rs b/src/weights.rs
@@ -32,7 +32,7 @@ use sp_std::marker::PhantomData;
 
 pub trait WeightInfo {
     fn create_supersig(z: u32, ) -> Weight;
-    fn propose_call(z: u32, ) -> Weight;
+    fn submit_call(z: u32, ) -> Weight;
     fn approve_call() -> Weight;
     fn remove_call() -> Weight;
     fn add_members(z: u32, ) -> Weight;
@@ -62,7 +62,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Supersig NonceCall (r:1 w:1)
 	// Storage: Supersig Calls (r:0 w:1)
-	fn propose_call(z: u32, ) -> Weight {
+	fn submit_call(z: u32, ) -> Weight {
 		Weight::from_ref_time(42_824_000u64)
 			// Standard Error: 0
 			.saturating_add(Weight::from_ref_time(1_000u64).saturating_mul(z as u64))