Refactor cross-contract calls examples (#91)

* Refactor `cross-contract-calls-advanced`

* Format `cross-contract-calls`

Author: davidsemakula

cross-contract-calls-advanced/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "cross-contract-calls"
+name = "cross-contract-calls-advanced"
 version = "6.0.0-beta.1"
 authors = ["Use Ink <[email protected]>"]
 edition = "2024"

cross-contract-calls-advanced/e2e_tests.rs

@@ -1,4 +1,4 @@
-use super::cross_contract_calls::*;
+use super::cross_contract_calls_advanced::*;
 use ink_e2e::ContractsBackend;
 
 type E2EResult<T> = std::result::Result<T, Box<dyn std::error::Error>>;
@@ -18,14 +18,18 @@ async fn instantiate_with_insufficient_storage_deposit_limit<Client: E2EBackend>
     const PROOF_SIZE_LIMIT: u64 = 100_000_000_000;
     let storage_deposit_limit = ink::U256::from(100_000_000_000_000u64);
 
-    let mut constructor = CrossContractCallsRef::new_with_limits(
+    let mut constructor = CrossContractCallsAdvancedRef::new_with_limits(
         other_contract_code.code_hash,
         REF_TIME_LIMIT,
         PROOF_SIZE_LIMIT,
         storage_deposit_limit,
     );
     let call_result = client
-        .instantiate("cross-contract-calls", &ink_e2e::alice(), &mut constructor)
+        .instantiate(
+            "cross-contract-calls-advanced",
+            &ink_e2e::alice(),
+            &mut constructor,
+        )
         .dry_run()
         .await?;
 
@@ -55,14 +59,18 @@ async fn instantiate_with_sufficient_limits<Client: E2EBackend>(
     // `pallet-revive`. but they should throw an error about `StorageLimitExhausted`.
     let storage_deposit_limit = ink::U256::from(100_000_000_000_000u64);
 
-    let mut constructor = CrossContractCallsRef::new_with_limits(
+    let mut constructor = CrossContractCallsAdvancedRef::new_with_limits(
         other_contract_code.code_hash,
         REF_TIME_LIMIT,
         PROOF_SIZE_LIMIT,
         storage_deposit_limit,
     );
     let contract = client
-        .instantiate("cross-contract-calls", &ink_e2e::alice(), &mut constructor)
+        .instantiate(
+            "cross-contract-calls-advanced",
+            &ink_e2e::alice(),
+            &mut constructor,
+        )
         .submit()
         .await;
 
@@ -81,9 +89,13 @@ async fn instantiate_no_limits<Client: E2EBackend>(mut client: Client) -> E2ERes
         .expect("other_contract upload failed");
 
     let mut constructor =
-        CrossContractCallsRef::new_no_limits(other_contract_code.code_hash);
+        CrossContractCallsAdvancedRef::new_no_limits(other_contract_code.code_hash);
     let contract = client
-        .instantiate("cross-contract-calls", &ink_e2e::alice(), &mut constructor)
+        .instantiate(
+            "cross-contract-calls-advanced",
+            &ink_e2e::alice(),
+            &mut constructor,
+        )
         .submit()
         .await;
 
@@ -102,13 +114,17 @@ async fn flip_and_get<Client: E2EBackend>(mut client: Client) -> E2EResult<()> {
         .expect("other_contract upload failed");
 
     let mut constructor =
-        CrossContractCallsRef::new_no_limits(other_contract_code.code_hash);
+        CrossContractCallsAdvancedRef::new_no_limits(other_contract_code.code_hash);
     let contract = client
-        .instantiate("cross-contract-calls", &ink_e2e::alice(), &mut constructor)
+        .instantiate(
+            "cross-contract-calls-advanced",
+            &ink_e2e::alice(),
+            &mut constructor,
+        )
         .submit()
         .await
         .expect("cross-contract-calls instantiate failed");
-    let mut call_builder = contract.call_builder::<CrossContractCalls>();
+    let mut call_builder = contract.call_builder::<CrossContractCallsAdvanced>();
 
     const REF_TIME_LIMIT: u64 = 500_000_000;
     const PROOF_SIZE_LIMIT: u64 = 100_000;

cross-contract-calls-advanced/lib.rs

@@ -1,16 +1,16 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 
 #[ink::contract]
-mod cross_contract_calls {
+mod cross_contract_calls_advanced {
     use ink::codegen::TraitCallBuilder;
     use other_contract::OtherContractRef;
 
     #[ink(storage)]
-    pub struct CrossContractCalls {
+    pub struct CrossContractCallsAdvanced {
         other_contract: OtherContractRef,
     }
 
-    impl CrossContractCalls {
+    impl CrossContractCallsAdvanced {
         /// Initializes the contract by instantiating the code at the given code hash via
         /// `instantiate` host function with the supplied weight and storage
         /// limits.

cross-contract-calls/e2e_tests.rs

@@ -1,6 +1,6 @@
 use super::cross_contract_calls::*;
-use other_contract::OtherContractRef;
 use ink_e2e::ContractsBackend;
+use other_contract::OtherContractRef;
 
 type E2EResult<T> = std::result::Result<T, Box<dyn std::error::Error>>;
 
@@ -15,8 +15,7 @@ async fn instantiate_no_limits<Client: E2EBackend>(mut client: Client) -> E2ERes
         .expect("other-contract instantiate failed");
 
     // when
-    let mut constructor =
-        CrossContractCallsRef::new(other_contract.addr);
+    let mut constructor = CrossContractCallsRef::new(other_contract.addr);
     let contract = client
         .instantiate("cross-contract-calls", &ink_e2e::alice(), &mut constructor)
         .submit()
@@ -38,8 +37,7 @@ async fn flip_and_get<Client: E2EBackend>(mut client: Client) -> E2EResult<()> {
         .await
         .expect("other-contract instantiate failed");
 
-    let mut constructor =
-        CrossContractCallsRef::new(other_contract.addr);
+    let mut constructor = CrossContractCallsRef::new(other_contract.addr);
     let contract = client
         .instantiate("cross-contract-calls", &ink_e2e::alice(), &mut constructor)
         .submit()

cross-contract-calls/lib.rs

@@ -17,7 +17,8 @@ mod cross_contract_calls {
         pub fn new(other_contract_address: ink::Address) -> Self {
             // Note: In the future, this will be replaced by:
             // let other_contract = OtherContractRef::from(other_contract_address);
-            let other_contract = ink::env::call::FromAddr::from_addr(other_contract_address);
+            let other_contract =
+                ink::env::call::FromAddr::from_addr(other_contract_address);
             Self { other_contract }
         }