@@ -59,8 +59,17 @@ use ink_env::{
5959use ink_primitives:: {
6060 DepositLimit ,
6161 H160 ,
62+ U256 ,
6263 abi:: AbiEncodeWith ,
63- U256
64+ } ;
65+ use ink_revive:: {
66+ CodeUploadReturnValue ,
67+ ExecReturnValue ,
68+ InstantiateReturnValue ,
69+ evm:: {
70+ CallLog ,
71+ CallTrace ,
72+ } ,
6473} ;
6574use ink_sandbox:: {
6675 AccountIdFor ,
@@ -74,23 +83,14 @@ use ink_sandbox::{
7483 pallet_revive,
7584} ;
7685use jsonrpsee:: core:: async_trait;
77- use ink_revive:: {
78- ExecReturnValue ,
79- CodeUploadReturnValue ,
80- InstantiateReturnValue ,
81- evm:: {
82- CallTrace ,
83- CallLog
84- } ,
85- } ;
8686use pallet_revive:: {
8787 AddressMapper ,
88- MomentOf ,
88+ MomentOf ,
8989 evm:: {
90- TracerType ,
91- Trace ,
9290 CallTracerConfig ,
93- }
91+ Trace ,
92+ TracerType ,
93+ } ,
9494} ;
9595use scale:: Decode ;
9696use sp_core:: {
@@ -642,9 +642,9 @@ where
642642 storage_deposit : to_revive_storage_deposit ( result. storage_deposit ) ,
643643 result : result. result . map ( |res| {
644644 ExecReturnValue {
645- flags : res. flags ,
646- data : res. data ,
647- }
645+ flags : res. flags ,
646+ data : res. data ,
647+ }
648648 } ) ,
649649 } ,
650650 trace : None , // todo
@@ -844,7 +844,6 @@ where
844844 OriginFor :: < S :: Runtime > :: from ( origin)
845845}
846846
847-
848847/// Convert a `pallet_revive::CallTrace` (sandbox) into an `ink_revive::CallTrace` (API).
849848fn to_revive_trace ( t : pallet_revive:: evm:: CallTrace ) -> CallTrace {
850849 CallTrace {
@@ -857,12 +856,18 @@ fn to_revive_trace(t: pallet_revive::evm::CallTrace) -> CallTrace {
857856 error : t. error ,
858857 revert_reason : t. revert_reason ,
859858 calls : t. calls . into_iter ( ) . map ( to_revive_trace) . collect ( ) ,
860- logs : t. logs . into_iter ( ) . map ( |log| CallLog {
861- address : log. address ,
862- topics : log. topics ,
863- data : log. data . 0 ,
864- ..Default :: default ( )
865- } ) . collect ( ) ,
859+ logs : t
860+ . logs
861+ . into_iter ( )
862+ . map ( |log| {
863+ CallLog {
864+ address : log. address ,
865+ topics : log. topics ,
866+ data : log. data . 0 ,
867+ ..Default :: default ( )
868+ }
869+ } )
870+ . collect ( ) ,
866871 value : t. value ,
867872 call_type : to_revive_call_type ( t. call_type ) ,
868873 }
@@ -873,7 +878,9 @@ fn to_revive_call_type(ct: pallet_revive::evm::CallType) -> ink_revive::evm::Cal
873878 match ct {
874879 pallet_revive:: evm:: CallType :: Call => ink_revive:: evm:: CallType :: Call ,
875880 pallet_revive:: evm:: CallType :: StaticCall => ink_revive:: evm:: CallType :: StaticCall ,
876- pallet_revive:: evm:: CallType :: DelegateCall => ink_revive:: evm:: CallType :: DelegateCall ,
881+ pallet_revive:: evm:: CallType :: DelegateCall => {
882+ ink_revive:: evm:: CallType :: DelegateCall
883+ }
877884 pallet_revive:: evm:: CallType :: Create => ink_revive:: evm:: CallType :: Create ,
878885 pallet_revive:: evm:: CallType :: Create2 => ink_revive:: evm:: CallType :: Create2 ,
879886 }
0 commit comments