Fix up more examples

examples/dns/Cargo.toml

@@ -6,10 +6,6 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink_primitives = { path = "../../crates/primitives", default-features = false }
-ink_metadata = { path = "../../crates/metadata", default-features = false, features = ["derive"], optional = true }
-ink_env = { path = "../../crates/env", default-features = false }
-ink_storage = { path = "../../crates/storage", default-features = false }
 ink = { path = "../../crates/ink", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
@@ -23,10 +19,6 @@ crate-type = ["cdylib"]
 [features]
 default = ["std"]
 std = [
-    "ink_primitives/std",
-    "ink_metadata/std",
-    "ink_env/std",
-    "ink_storage/std",
     "ink/std",
     "scale/std",
     "scale-info/std",

examples/dns/lib.rs

@@ -1,10 +1,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use ink_lang as ink;
-
 #[ink::contract]
 mod dns {
-    use ink_storage::Mapping;
+    use ink::storage::Mapping;
 
     /// Emitted whenever a new name is being registered.
     #[ink(event)]
@@ -172,15 +170,14 @@ mod dns {
     #[cfg(test)]
     mod tests {
         use super::*;
-        use ink_lang as ink;
 
         fn default_accounts(
-        ) -> ink_env::test::DefaultAccounts<ink_env::DefaultEnvironment> {
-            ink_env::test::default_accounts::<Environment>()
+        ) -> ink::env::test::DefaultAccounts<ink::env::DefaultEnvironment> {
+            ink::env::test::default_accounts::<Environment>()
         }
 
         fn set_next_caller(caller: AccountId) {
-            ink_env::test::set_caller::<Environment>(caller);
+            ink::env::test::set_caller::<Environment>(caller);
         }
 
         #[ink::test]

examples/erc20/lib.rs

@@ -217,13 +217,12 @@ mod erc20 {
     mod tests {
         use super::*;
 
-        use ink_env::Clear;
-        use ink_lang as ink;
+        use ink::env::Clear;
 
         type Event = <Erc20 as ::ink::reflect::ContractEventBase>::Type;
 
         fn assert_transfer_event(
-            event: &ink_env::test::EmittedEvent,
+            event: &ink::env::test::EmittedEvent,
             expected_from: Option<AccountId>,
             expected_to: Option<AccountId>,
             expected_value: Balance,
@@ -279,7 +278,7 @@ mod erc20 {
             let _erc20 = Erc20::new(100);
 
             // Transfer event triggered during initial construction.
-            let emitted_events = ink_env::test::recorded_events().collect::<Vec<_>>();
+            let emitted_events = ink::env::test::recorded_events().collect::<Vec<_>>();
             assert_eq!(1, emitted_events.len());
 
             assert_transfer_event(
@@ -296,7 +295,7 @@ mod erc20 {
             // Constructor works.
             let erc20 = Erc20::new(100);
             // Transfer event triggered during initial construction.
-            let emitted_events = ink_env::test::recorded_events().collect::<Vec<_>>();
+            let emitted_events = ink::env::test::recorded_events().collect::<Vec<_>>();
             assert_transfer_event(
                 &emitted_events[0],
                 None,
@@ -313,15 +312,15 @@ mod erc20 {
             // Constructor works
             let erc20 = Erc20::new(100);
             // Transfer event triggered during initial construction
-            let emitted_events = ink_env::test::recorded_events().collect::<Vec<_>>();
+            let emitted_events = ink::env::test::recorded_events().collect::<Vec<_>>();
             assert_transfer_event(
                 &emitted_events[0],
                 None,
                 Some(AccountId::from([0x01; 32])),
                 100,
             );
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Alice owns all the tokens on contract instantiation
             assert_eq!(erc20.balance_of(accounts.alice), 100);
             // Bob does not owns tokens
@@ -334,15 +333,15 @@ mod erc20 {
             let mut erc20 = Erc20::new(100);
             // Transfer event triggered during initial construction.
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
 
             assert_eq!(erc20.balance_of(accounts.bob), 0);
             // Alice transfers 10 tokens to Bob.
             assert_eq!(erc20.transfer(accounts.bob, 10), Ok(()));
             // Bob owns 10 tokens.
             assert_eq!(erc20.balance_of(accounts.bob), 10);
 
-            let emitted_events = ink_env::test::recorded_events().collect::<Vec<_>>();
+            let emitted_events = ink::env::test::recorded_events().collect::<Vec<_>>();
             assert_eq!(emitted_events.len(), 2);
             // Check first transfer event related to ERC-20 instantiation.
             assert_transfer_event(
@@ -365,14 +364,14 @@ mod erc20 {
             // Constructor works.
             let mut erc20 = Erc20::new(100);
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
 
             assert_eq!(erc20.balance_of(accounts.bob), 0);
 
             // Set the contract as callee and Bob as caller.
-            let contract = ink_env::account_id::<ink_env::DefaultEnvironment>();
-            ink_env::test::set_callee::<ink_env::DefaultEnvironment>(contract);
-            ink_env::test::set_caller::<ink_env::DefaultEnvironment>(accounts.bob);
+            let contract = ink::env::account_id::<ink::env::DefaultEnvironment>();
+            ink::env::test::set_callee::<ink::env::DefaultEnvironment>(contract);
+            ink::env::test::set_caller::<ink::env::DefaultEnvironment>(accounts.bob);
 
             // Bob fails to transfers 10 tokens to Eve.
             assert_eq!(
@@ -385,7 +384,7 @@ mod erc20 {
             assert_eq!(erc20.balance_of(accounts.eve), 0);
 
             // Transfer event triggered during initial construction.
-            let emitted_events = ink_env::test::recorded_events().collect::<Vec<_>>();
+            let emitted_events = ink::env::test::recorded_events().collect::<Vec<_>>();
             assert_eq!(emitted_events.len(), 1);
             assert_transfer_event(
                 &emitted_events[0],
@@ -401,7 +400,7 @@ mod erc20 {
             let mut erc20 = Erc20::new(100);
             // Transfer event triggered during initial construction.
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
 
             // Bob fails to transfer tokens owned by Alice.
             assert_eq!(
@@ -412,12 +411,12 @@ mod erc20 {
             assert_eq!(erc20.approve(accounts.bob, 10), Ok(()));
 
             // The approve event takes place.
-            assert_eq!(ink_env::test::recorded_events().count(), 2);
+            assert_eq!(ink::env::test::recorded_events().count(), 2);
 
             // Set the contract as callee and Bob as caller.
-            let contract = ink_env::account_id::<ink_env::DefaultEnvironment>();
-            ink_env::test::set_callee::<ink_env::DefaultEnvironment>(contract);
-            ink_env::test::set_caller::<ink_env::DefaultEnvironment>(accounts.bob);
+            let contract = ink::env::account_id::<ink::env::DefaultEnvironment>();
+            ink::env::test::set_callee::<ink::env::DefaultEnvironment>(contract);
+            ink::env::test::set_caller::<ink::env::DefaultEnvironment>(accounts.bob);
 
             // Bob transfers tokens from Alice to Eve.
             assert_eq!(
@@ -428,7 +427,7 @@ mod erc20 {
             assert_eq!(erc20.balance_of(accounts.eve), 10);
 
             // Check all transfer events that happened during the previous calls:
-            let emitted_events = ink_env::test::recorded_events().collect::<Vec<_>>();
+            let emitted_events = ink::env::test::recorded_events().collect::<Vec<_>>();
             assert_eq!(emitted_events.len(), 3);
             assert_transfer_event(
                 &emitted_events[0],
@@ -449,20 +448,20 @@ mod erc20 {
         fn allowance_must_not_change_on_failed_transfer() {
             let mut erc20 = Erc20::new(100);
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
 
             // Alice approves Bob for token transfers on her behalf.
             let alice_balance = erc20.balance_of(accounts.alice);
             let initial_allowance = alice_balance + 2;
             assert_eq!(erc20.approve(accounts.bob, initial_allowance), Ok(()));
 
             // Get contract address.
-            let callee = ink_env::account_id::<ink_env::DefaultEnvironment>();
-            ink_env::test::set_callee::<ink_env::DefaultEnvironment>(callee);
-            ink_env::test::set_caller::<ink_env::DefaultEnvironment>(accounts.bob);
+            let callee = ink::env::account_id::<ink::env::DefaultEnvironment>();
+            ink::env::test::set_callee::<ink::env::DefaultEnvironment>(callee);
+            ink::env::test::set_caller::<ink::env::DefaultEnvironment>(accounts.bob);
 
             // Bob tries to transfer tokens from Alice to Eve.
-            let emitted_events_before = ink_env::test::recorded_events().count();
+            let emitted_events_before = ink::env::test::recorded_events().count();
             assert_eq!(
                 erc20.transfer_from(accounts.alice, accounts.eve, alice_balance + 1),
                 Err(Error::InsufficientBalance)
@@ -475,7 +474,7 @@ mod erc20 {
             // No more events must have been emitted
             assert_eq!(
                 emitted_events_before,
-                ink_env::test::recorded_events().count()
+                ink::env::test::recorded_events().count()
             )
         }
 
@@ -505,7 +504,7 @@ mod erc20 {
         where
             T: scale::Encode,
         {
-            use ink_env::{
+            use ink::env::{
                 hash::{
                     Blake2x256,
                     CryptoHash,

examples/erc721/Cargo.toml

@@ -6,10 +6,6 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink_primitives = { path = "../../crates/primitives", default-features = false }
-ink_metadata = { path = "../../crates/metadata", default-features = false, features = ["derive"], optional = true }
-ink_env = { path = "../../crates/env", default-features = false }
-ink_storage = { path = "../../crates/storage", default-features = false }
 ink = { path = "../../crates/ink", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
@@ -23,10 +19,6 @@ crate-type = ["cdylib"]
 [features]
 default = ["std"]
 std = [
-    "ink_primitives/std",
-    "ink_metadata/std",
-    "ink_env/std",
-    "ink_storage/std",
     "ink/std",
     "scale/std",
     "scale-info/std",

examples/erc721/lib.rs

@@ -50,11 +50,9 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use ink_lang as ink;
-
 #[ink::contract]
 mod erc721 {
-    use ink_storage::Mapping;
+    use ink::storage::Mapping;
 
     use scale::{
         Decode,
@@ -409,12 +407,11 @@ mod erc721 {
     mod tests {
         /// Imports all the definitions from the outer scope so we can use them here.
         use super::*;
-        use ink_lang as ink;
 
         #[ink::test]
         fn mint_works() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Token 1 does not exists.
@@ -430,13 +427,13 @@ mod erc721 {
         #[ink::test]
         fn mint_existing_should_fail() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Create token Id 1.
             assert_eq!(erc721.mint(1), Ok(()));
             // The first Transfer event takes place
-            assert_eq!(1, ink_env::test::recorded_events().count());
+            assert_eq!(1, ink::env::test::recorded_events().count());
             // Alice owns 1 token.
             assert_eq!(erc721.balance_of(accounts.alice), 1);
             // Alice owns token Id 1.
@@ -449,7 +446,7 @@ mod erc721 {
         #[ink::test]
         fn transfer_works() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Create token Id 1 for Alice
@@ -459,19 +456,19 @@ mod erc721 {
             // Bob does not owns any token
             assert_eq!(erc721.balance_of(accounts.bob), 0);
             // The first Transfer event takes place
-            assert_eq!(1, ink_env::test::recorded_events().count());
+            assert_eq!(1, ink::env::test::recorded_events().count());
             // Alice transfers token 1 to Bob
             assert_eq!(erc721.transfer(accounts.bob, 1), Ok(()));
             // The second Transfer event takes place
-            assert_eq!(2, ink_env::test::recorded_events().count());
+            assert_eq!(2, ink::env::test::recorded_events().count());
             // Bob owns token 1
             assert_eq!(erc721.balance_of(accounts.bob), 1);
         }
 
         #[ink::test]
         fn invalid_transfer_should_fail() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Transfer token fails if it does not exists.
@@ -493,7 +490,7 @@ mod erc721 {
         #[ink::test]
         fn approved_transfer_works() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Create token Id 1.
@@ -522,7 +519,7 @@ mod erc721 {
         #[ink::test]
         fn approved_for_all_works() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Create token Id 1.
@@ -565,7 +562,7 @@ mod erc721 {
         #[ink::test]
         fn not_approved_transfer_should_fail() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Create token Id 1.
@@ -594,7 +591,7 @@ mod erc721 {
         #[ink::test]
         fn burn_works() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Create token Id 1 for Alice
@@ -622,7 +619,7 @@ mod erc721 {
         #[ink::test]
         fn burn_fails_not_owner() {
             let accounts =
-                ink_env::test::default_accounts::<ink_env::DefaultEnvironment>();
+                ink::env::test::default_accounts::<ink::env::DefaultEnvironment>();
             // Create a new contract instance.
             let mut erc721 = Erc721::new();
             // Create token Id 1 for Alice
@@ -633,7 +630,7 @@ mod erc721 {
         }
 
         fn set_caller(sender: AccountId) {
-            ink_env::test::set_caller::<ink_env::DefaultEnvironment>(sender);
+            ink::env::test::set_caller::<ink::env::DefaultEnvironment>(sender);
         }
     }
 }