Update erc20 pallet

Cerebellum-Network · Jul 5, 2023 · 3ec2224 · 3ec2224
1 parent 6fd2610
commit 3ec2224
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pallets/erc20/src/lib.rs b/pallets/erc20/src/lib.rs
@@ -31,9 +31,9 @@ type BalanceOf<T> =
     <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
 pub trait Config: system::Config + bridge::Config + erc721::Config {
-    type Event: From<Event<Self>> + Into<<Self as frame_system::Config>::Event>;
+    type RuntimeEvent: From<Event<Self>> + Into<<Self as frame_system::Config>::RuntimeEvent>;
     /// Specifies the origin check provided by the bridge for calls that can only be called by the bridge pallet
-    type BridgeOrigin: EnsureOrigin<Self::Origin, Success = Self::AccountId>;
+    type BridgeOrigin: EnsureOrigin<Self::RuntimeOrigin, Success = Self::AccountId>;
 
     /// The currency mechanism.
     type Currency: Currency<Self::AccountId>;
@@ -63,7 +63,7 @@ decl_event!(
 );
 
 decl_module! {
-    pub struct Module<T: Config> for enum Call where origin: T::Origin {
+    pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
         const HashId: ResourceId = T::HashId::get();
         const NativeTokenId: ResourceId = T::NativeTokenId::get();
         const Erc721Id: ResourceId = T::Erc721Id::get();

diff --git a/pallets/erc721/src/lib.rs b/pallets/erc721/src/lib.rs
@@ -3,10 +3,10 @@
 
 use sp_std::marker::PhantomData;
 use frame_support::{
-	dispatch::{DispatchResult}, decl_module, decl_storage, decl_event, decl_error,
-	ensure,
+	dispatch::{DispatchResult, DispatchClass, ClassifyDispatch, WeighData, PaysFee, Pays},
+    decl_module, decl_storage, decl_event, decl_error, ensure,
 	traits::Get,
-	weights::{DispatchClass, ClassifyDispatch, WeighData, Weight, PaysFee, Pays},
+	weights::{Weight},
 };
 use sp_std::prelude::*;
 use frame_system::{self as system, ensure_signed, ensure_root};
@@ -34,7 +34,7 @@ pub struct Erc721Token {
 }
 
 pub trait Config: system::Config {
-    type Event: From<Event<Self>> + Into<<Self as system::Config>::Event>;
+    type RuntimeEvent: From<Event<Self>> + Into<<Self as system::Config>::RuntimeEvent>;
 
     /// Some identifier for this token type, possibly the originating ethereum address.
     /// This is not explicitly used for anything, but may reflect the bridge's notion of resource ID.
@@ -78,7 +78,7 @@ decl_event!(
 );
 
 decl_module! {
-	pub struct Module<T: Config> for enum Call where origin: T::Origin {
+	pub struct Module<T: Config> for enum Call where origin: T::RuntimeOrigin {
         type Error = Error<T>;
         fn deposit_event() = default;