Re-export initialize_contract function (#1077)

* Re-export the `initialize_contract` function

* Use re-exported version in example contracts

* Re-export `initialize_contract` from `utils` module

* Change remaining usage of `ink_lang::codegen` to `ink_lang::utils`

crates/lang/src/lib.rs

@@ -21,6 +21,13 @@ pub mod result_info;
 #[cfg_attr(not(feature = "show-codegen-docs"), doc(hidden))]
 pub mod codegen;
 
+/// Utility functions for contract development.
+pub mod utils {
+    // We want to expose this function without making users go through
+    // the `codgen` module
+    pub use super::codegen::initialize_contract;
+}
+
 pub mod reflect;
 
 mod chain_extension;

crates/lang/tests/ui/contract/pass/example-erc20-works.rs

@@ -58,7 +58,7 @@ mod erc20 {
         /// Creates a new ERC-20 contract with the specified initial supply.
         #[ink(constructor)]
         pub fn new(initial_supply: Balance) -> Self {
-            ink_lang::codegen::initialize_contract(|contract| {
+            ink_lang::utils::initialize_contract(|contract| {
                 Self::new_init(contract, initial_supply)
             })
         }

crates/lang/tests/ui/contract/pass/example-erc721-works.rs

@@ -79,7 +79,7 @@ mod erc721 {
         pub fn new() -> Self {
             // This call is required in order to correctly initialize the
             // `Mapping`s of our contract.
-            ink_lang::codegen::initialize_contract(|_| {})
+            ink_lang::utils::initialize_contract(|_| {})
         }
 
         /// Returns the balance of the owner.

examples/dns/lib.rs

@@ -85,7 +85,9 @@ mod dns {
         /// Creates a new domain name service contract.
         #[ink(constructor)]
         pub fn new() -> Self {
-            ink_lang::codegen::initialize_contract(|contract: &mut Self| {
+            // This call is required in order to correctly initialize the
+            // `Mapping`s of our contract.
+            ink_lang::utils::initialize_contract(|contract: &mut Self| {
                 contract.default_address = Default::default();
             })
         }

examples/erc1155/lib.rs

@@ -272,7 +272,7 @@ mod erc1155 {
             // `Mapping`s of our contract.
             //
             // Not that `token_id_nonce` will be initialized to its `Default` value.
-            ink_lang::codegen::initialize_contract(|_| {})
+            ink_lang::utils::initialize_contract(|_| {})
         }
 
         /// Create the initial supply for a token.

examples/erc20/lib.rs

@@ -60,7 +60,9 @@ mod erc20 {
         /// Creates a new ERC-20 contract with the specified initial supply.
         #[ink(constructor)]
         pub fn new(initial_supply: Balance) -> Self {
-            ink_lang::codegen::initialize_contract(|contract| {
+            // This call is required in order to correctly initialize the
+            // `Mapping`s of our contract.
+            ink_lang::utils::initialize_contract(|contract| {
                 Self::new_init(contract, initial_supply)
             })
         }

examples/erc721/lib.rs

@@ -131,7 +131,7 @@ mod erc721 {
         pub fn new() -> Self {
             // This call is required in order to correctly initialize the
             // `Mapping`s of our contract.
-            ink_lang::codegen::initialize_contract(|_| {})
+            ink_lang::utils::initialize_contract(|_| {})
         }
 
         /// Returns the balance of the owner.

examples/multisig/lib.rs

@@ -281,7 +281,7 @@ mod multisig {
         /// If `requirement` violates our invariant.
         #[ink(constructor)]
         pub fn new(requirement: u32, mut owners: Vec<AccountId>) -> Self {
-            ink_lang::codegen::initialize_contract(|contract: &mut Self| {
+            ink_lang::utils::initialize_contract(|contract: &mut Self| {
                 owners.sort_unstable();
                 owners.dedup();
                 ensure_requirement_is_valid(owners.len() as u32, requirement);

examples/trait-erc20/lib.rs

@@ -97,7 +97,7 @@ mod erc20 {
         /// Creates a new ERC-20 contract with the specified initial supply.
         #[ink(constructor)]
         pub fn new(initial_supply: Balance) -> Self {
-            ink_lang::codegen::initialize_contract(|contract| {
+            ink_lang::utils::initialize_contract(|contract| {
                 Self::new_init(contract, initial_supply)
             })
         }