Update ddc-pallet

pallets/ddc/src/lib.rs

@@ -22,7 +22,7 @@ mod tests;
 /// Configure the pallet by specifying the parameters and types on which it depends.
 pub trait Config: frame_system::Config {
 	/// Because this pallet emits events, it depends on the runtime's definition of an event.
-	type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+	type RuntimeEvent: From<Event<Self>> + Into<<Self as frame_system::Config>::RuntimeEvent>;
 
 	/// The minimum length a name may be.
 	type MinLength: Get<usize>;
@@ -73,7 +73,7 @@ decl_error! {
 // Dispatchable functions must be annotated with a weight and must return a DispatchResult.
 decl_module! {
 	/// CereDDCModule declaration.
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
 		// Errors must be initialized if they are used by the pallet.
 		type Error = Error<T>;
 

pallets/ddc/src/mock.rs

@@ -33,16 +33,16 @@ impl system::Config for Test {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
-	type Origin = Origin;
-	type Call = Call;
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
 	type Index = u64;
 	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
+	type RuntimeEvent = ();
 	type BlockHashCount = BlockHashCount;
 	type DbWeight = ();
 	type Version = ();
@@ -62,7 +62,7 @@ parameter_types! {
 }
 
 impl pallet_cere_ddc::Config for Test {
-	type Event = ();
+	type RuntimeEvent = ();
 	type MinLength = MinLength;
 	type MaxLength = MaxLength;
 }

pallets/ddc/src/tests.rs

@@ -7,7 +7,7 @@ const BOB: u64 = 2;
 fn send_data_works_valid_input() {
 	new_test_ext().execute_with(|| {
 		// Dispatch a signed extrinsic.
-		assert_ok!(CereDDCModule::send_data(Origin::signed(1), BOB, b"12345678".to_vec()));
+		assert_ok!(CereDDCModule::send_data(RuntimeOrigin::signed(1), BOB, b"12345678".to_vec()));
 	});
 }
 
@@ -16,7 +16,7 @@ fn send_data_error_too_long() {
 	new_test_ext().execute_with(|| {
 		// Ensure the expected error is thrown when no value is present.
 		assert_noop!(
-			CereDDCModule::send_data(Origin::signed(1), BOB, b"TestTooLongString".to_vec()),
+			CereDDCModule::send_data(RuntimeOrigin::signed(1), BOB, b"TestTooLongString".to_vec()),
 			Error::<Test>::TooLong
 		);
 	});
@@ -27,7 +27,7 @@ fn send_data_error_too_short() {
 	new_test_ext().execute_with(|| {
 		// Ensure the expected error is thrown when no value is present.
 		assert_noop!(
-			CereDDCModule::send_data(Origin::signed(1), BOB, b"Short".to_vec()),
+			CereDDCModule::send_data(RuntimeOrigin::signed(1), BOB, b"Short".to_vec()),
 			Error::<Test>::TooShort
 		);
 	});