Improve structure

.gitlab-ci.yml

@@ -74,14 +74,6 @@ check-std:
         cargo check --verbose --all-features --manifest-path crates/${crate}/Cargo.toml;
       done
 
-    # Just needed as long as we have the `ink-experimental-engine` feature.
-    # We do not invoke `--all-features` here -- this would imply the feature
-    # `ink-experimental-engine`. So in order to still run the tests without the
-    # experimental engine feature we need this command.
-    - for crate in ${ALL_CRATES}; do
-        cargo check --verbose --features std --manifest-path crates/${crate}/Cargo.toml;
-       done
-
 check-wasm:
   stage:                           check
   <<:                              *docker-env
@@ -208,13 +200,8 @@ clippy-std:
     - job:                         check-std
       artifacts:                   false
   script:
-    # Just needed as long as we have the `ink-experimental-engine` feature:
-    # `--all-features` here implies the feature `ink-experimental-engine`.
-    # So in order to still run the tests without the experimental engine
-    # feature we need to explicitly run with `std`.
     - for crate in ${ALL_CRATES}; do
         cargo clippy --verbose --all-features --manifest-path crates/${crate}/Cargo.toml -- -D warnings;
-        cargo clippy --verbose --features std  --manifest-path crates/${crate}/Cargo.toml -- -D warnings;
       done
 
 clippy-wasm:
@@ -258,9 +245,9 @@ examples-test-experimental-engine:
     - job:                         clippy-std
       artifacts:                   false
   script:
-    # we test only the examples for which the tests have already been migrated to
+    # We test only the examples for which the tests have already been migrated to
     # use the experimental engine.
-    - cargo test --no-default-features --features std, ink-experimental-engine --verbose --manifest-path erc20/Cargo.toml
+    - cargo test --no-default-features --features std, ink-experimental-engine --verbose --manifest-path examples/erc20/Cargo.toml
 
 examples-fmt:
   stage:                           examples

crates/engine/Cargo.toml

@@ -17,24 +17,18 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 [dependencies]
 scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive", "full"] }
 derive_more = { version = "0.99", default-features = false, features = ["from", "display"] }
-num-traits = { version = "0.2", default-features = false, features = ["i128"] }
-paste = "1.0"
 
 sha2 = { version = "0.9" }
 sha3 = { version = "0.9" }
 blake2 = { version = "0.9" }
 
 rand = { version = "0.8", default-features = false, features = ["alloc"], optional = true }
-scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
 
 [features]
 default = ["std"]
 std = [
     "scale/std",
-    "scale-info",
-    "scale-info/std",
     "rand",
     "rand/std",
     "rand/std_rng",
-    "num-traits/std",
 ]

crates/engine/src/exec_context.rs

@@ -13,19 +13,25 @@
 // limitations under the License.
 
 use super::{
-    types::AccountId,
-    OffChainError,
+    types::{
+        AccountId,
+        Balance,
+    },
+    Error,
 };
 
-pub type Result<T> = core::result::Result<T, OffChainError>;
+type Result<T> = core::result::Result<T, Error>;
 
+/// The context of a contract execution.
 pub struct ExecContext {
     /// The caller of the contract execution.
     ///
     /// Might be user or another contract.
     pub caller: AccountId,
     /// The callee of the contract execution.
     pub callee: AccountId,
+    /// The value transferred to the contract as part of the call.
+    pub value_transferred: Balance,
 }
 
 impl ExecContext {