Fix tests

Author: cmichi

crates/env/src/call/execution.rs

@@ -16,7 +16,10 @@ use super::{
     utils::ReturnType,
     Selector,
 };
-use crate::Environment;
+use crate::{
+    call::utils::DecodeMessageResult,
+    Environment,
+};
 use alloy_sol_types::{
     private::SolTypeValue,
     SolType,
@@ -31,7 +34,6 @@ use ink_primitives::reflect::{
     ScaleEncoding,
     SolEncoding,
 };
-use crate::call::utils::DecodeMessageResult;
 
 /// The input data and the expected return type of a contract execution.
 pub struct Execution<Args, Output, Abi> {
@@ -78,7 +80,7 @@ pub trait Executor<E: Environment> {
     ) -> Result<ink_primitives::MessageResult<Output>, Self::Error>
     where
         Args: AbiEncodeWith<Abi>,
-        Output: AbiDecodeWith<Abi>;
+        Output: AbiDecodeWith<Abi> + DecodeMessageResult<Abi>;
 }
 
 /// The input data for a smart contract execution.

crates/ink/tests/ui/contract/pass/message-selector-encoding-all.rs

@@ -1,6 +1,3 @@
-fn main() {}
-/*
-// todo bring back once errors with "duplicate definitions for `…`" fixed.
 use contract::Contract;
 
 #[ink::contract(abi = "all")]
@@ -108,4 +105,3 @@ fn main() {
         [0xdc, 0x48, 0xaa, 0x5a],
     );
 }
-*/

integration-tests/public/runtime-call-contract/sandbox-runtime/pallet-revive-caller/src/executor.rs

@@ -7,21 +7,25 @@ use frame_system::pallet_prelude::OriginFor;
 use ink::{
     env::{
         call::{
+            utils::DecodeMessageResult,
             ExecutionInput,
             Executor,
         },
         Environment,
     },
     primitives::U256,
+    reflect::{
+        AbiDecodeWith,
+        AbiEncodeWith,
+    },
+    MessageResult,
     H160,
 };
 use pallet_revive::{
     DepositLimit,
     MomentOf,
 };
 use sp_runtime::traits::Bounded;
-use ink::env::call::utils::DecodeMessageResult;
-use ink::reflect::AbiDecodeWith;
 
 pub struct PalletReviveExecutor<E: Environment, Runtime: pallet_revive::Config> {
     // todo
@@ -50,10 +54,10 @@ where
     fn exec<Args, Output, Abi>(
         &self,
         input: &ExecutionInput<Args, Abi>,
-    ) -> Result<ink::MessageResult<Output>, Self::Error>
+    ) -> Result<MessageResult<Output>, Self::Error>
     where
-        Args: ink::reflect::AbiEncodeWith<Abi>,
-        Output: ink::reflect::AbiDecodeWith<Abi> + DecodeMessageResult<Abi>,
+        Args: AbiEncodeWith<Abi>,
+        Output: AbiDecodeWith<Abi> + DecodeMessageResult<Abi>,
     {
         let data = input.encode();
         let result = pallet_revive::Pallet::<R>::bare_call(
@@ -69,7 +73,7 @@ where
         );
 
         let output = result.result?.data;
-        let result = codec::Decode::decode(&mut &output[..]).map_err(|_| {
+        let result = DecodeMessageResult::decode_output(&output[..]).map_err(|_| {
             sp_runtime::DispatchError::Other("Failed to decode contract output")
         })?;