git.delta.rocks / unique-network / refs/commits / 489bde0fa2e0

difftreelog

fix after rebase

Trubnikov Sergey2022-11-25parent: #b7f8a6b.patch.diff
in: master

2 files changed

modifiedcrates/evm-coder/src/abi/impls.rsdiffbeforeafterboth
147}147}
148148
149impl AbiWrite for Property {149impl AbiWrite for Property {
150 fn abi_write(&self, writer: &mut AbiWriter) {150 fn abi_write<'a>(&'a self, writer: &mut AbiWriter) {
151 (&self.key, &self.value).abi_write(writer);151 (self.key.clone(), self.value.clone()).abi_write(writer);
152 }152 }
153}153}
154154
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -123,7 +123,7 @@
 impl EthCrossAccount {
 	pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self
 	where
-		T: pallet_evm::account::Config,
+		T: pallet_evm::Config,
 		T::AccountId: AsRef<[u8; 32]>,
 	{
 		if cross_account_id.is_canonical_substrate() {
@@ -141,7 +141,7 @@
 
 	pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>
 	where
-		T: pallet_evm::account::Config,
+		T: pallet_evm::Config,
 		T::AccountId: From<[u8; 32]>,
 	{
 		if self.eth == Default::default() && self.sub == Default::default() {