merging cleanup

crates/e2e/macro/src/codegen.rs

@@ -12,11 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{ir, config::Backend};
+use crate::{
+    config::Backend,
+    ir,
+};
 use derive_more::From;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 
+const DEFAULT_CONTRACTS_NODE: &str = "substrate-contracts-node";
+
 /// Generates code for the `[ink::e2e_test]` macro.
 #[derive(From)]
 pub struct InkE2ETest {
@@ -62,8 +67,8 @@ impl InkE2ETest {
         };
 
         let client_building = match self.test.config.backend() {
-            Backend::Full => build_full_client(&environment, contracts),
-            Backend::RuntimeOnly => build_runtime_client(contracts),
+            Backend::Full => build_full_client(&environment, exec_build_contracts),
+            Backend::RuntimeOnly => build_runtime_client(exec_build_contracts),
         };
 
         quote! {
@@ -104,10 +109,7 @@ impl InkE2ETest {
     }
 }
 
-fn build_full_client<I: Iterator<Item = TokenStream2>>(
-    environment: &syn::Path,
-    contracts: I,
-) -> TokenStream2 {
+fn build_full_client(environment: &syn::Path, contracts: TokenStream2) -> TokenStream2 {
     // Use the user supplied `CONTRACTS_NODE` or default to `DEFAULT_CONTRACTS_NODE`.
     let contracts_node: &'static str =
         option_env!("CONTRACTS_NODE").unwrap_or(DEFAULT_CONTRACTS_NODE);
@@ -134,20 +136,17 @@ fn build_full_client<I: Iterator<Item = TokenStream2>>(
                 ::core::panic!("Error spawning substrate-contracts-node: {err:?}")
             );
 
+        let contracts = #contracts;
         let mut client = ::ink_e2e::Client::<
             ::ink_e2e::PolkadotConfig,
             #environment
-        >::new(
-            node_proc.client(),
-            [ #( #contracts ),* ]
-        ).await;
+        >::new(node_proc.client(), contracts).await;
     }
 }
 
-fn build_runtime_client<I: Iterator<Item = TokenStream2>>(contracts: I) -> TokenStream2 {
+fn build_runtime_client(contracts: TokenStream2) -> TokenStream2 {
     quote! {
-        let mut client = ::ink_e2e::DrinkClient::new(
-            [ #( #contracts ),* ]
-        );
+        let contracts = #contracts;
+        let mut client = ::ink_e2e::DrinkClient::new(contracts);
     }
 }

crates/e2e/src/client_utils.rs

@@ -24,11 +24,11 @@ pub struct ContractsRegistry {
 
 impl ContractsRegistry {
     /// Create a new registry with the given contracts.
-    pub fn new<'a>(contracts: impl IntoIterator<Item = &'a str>) -> Self {
+    pub fn new<P: Into<PathBuf>>(contracts: impl IntoIterator<Item = P>) -> Self {
         let contracts = contracts
             .into_iter()
             .map(|path| {
-                let wasm_path = PathBuf::from(path);
+                let wasm_path: PathBuf = path.into();
                 let contract_name = wasm_path.file_stem().unwrap_or_else(|| {
                     panic!("Invalid contract wasm path '{}'", wasm_path.display(),)
                 });

crates/e2e/src/contract_build.rs

@@ -188,7 +188,6 @@ fn build_contract(path_to_cargo_toml: &Path) -> PathBuf {
                 .expect("Wasm code artifact not generated")
                 .canonicalize()
                 .expect("Invalid dest bundle path")
-                .to_path_buf()
         }
         Err(err) => {
             panic!(

crates/e2e/src/drink_client.rs

@@ -44,7 +44,10 @@ use sp_core::{
     sr25519::Pair,
     Pair as _,
 };
-use std::marker::PhantomData;
+use std::{
+    marker::PhantomData,
+    path::PathBuf,
+};
 use subxt::dynamic::Value;
 use subxt_signer::sr25519::Keypair;
 
@@ -57,7 +60,7 @@ pub struct Client<AccountId, Hash> {
 unsafe impl<AccountId, Hash> Send for Client<AccountId, Hash> {}
 
 impl<AccountId, Hash> Client<AccountId, Hash> {
-    pub fn new<'a>(contracts: impl IntoIterator<Item = &'a str>) -> Self {
+    pub fn new<P: Into<PathBuf>>(contracts: impl IntoIterator<Item = P>) -> Self {
         let mut sandbox = Sandbox::new().expect("Failed to initialize Drink! sandbox");
         Self::fund_accounts(&mut sandbox);
 

crates/e2e/src/lib.rs

@@ -21,9 +21,9 @@
 
 mod backend;
 mod builders;
+mod client_utils;
 mod contract_build;
 mod contract_results;
-mod client_utils;
 mod drink_client;
 mod error;
 pub mod events;

crates/e2e/src/subxt_client.rs

@@ -53,6 +53,7 @@ use scale::{
 };
 #[cfg(feature = "std")]
 use std::fmt::Debug;
+use std::path::PathBuf;
 
 use crate::{
     backend::ChainBackend,
@@ -119,9 +120,9 @@ where
     E::Hash: Debug + scale::Encode,
 {
     /// Creates a new [`Client`] instance using a `subxt` client.
-    pub async fn new<P>(
+    pub async fn new<P: Into<PathBuf>>(
         client: subxt::OnlineClient<C>,
-        contracts: impl IntoIterator<Item = &str>,
+        contracts: impl IntoIterator<Item = P>,
     ) -> Self {
         Self {
             api: ContractsApi::new(client).await,