merge master

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Changed
 - Restrict which `cfg` attributes can be used ‒ [#2313](https://github.com/use-ink/ink/pull/2313)
+- More idiomatic return types for metadata getters - [#2398](https://github.com/use-ink/ink/pull/2398)
 
 ## Added
 - Add feature flag to compile contracts for `pallet-revive` ‒ [#2318](https://github.com/use-ink/ink/pull/2318)

crates/e2e/src/node_proc.rs

@@ -167,8 +167,6 @@ where
         let stderr = proc.stderr.take().unwrap();
         let port = find_substrate_port_from_output(stderr);
         let url = format!("ws://127.0.0.1:{port}");
-        // TODO: need access to the use port for hardhat
-        println!("Connecting to node at {}", url);
 
         // Connect to the node with a `subxt` client:
         let rpc = RpcClient::from_url(url.clone())

crates/metadata/src/lib.rs

@@ -123,8 +123,8 @@ impl InkProject {
     }
 
     /// Returns the metadata version used by the contract.
-    pub fn version(&self) -> &u64 {
-        &self.version
+    pub fn version(&self) -> u64 {
+        self.version
     }
 
     /// Returns a read-only registry of types in the contract.

crates/metadata/src/specs.rs

@@ -431,8 +431,8 @@ where
     }
 
     /// Returns if the constructor is payable by the caller.
-    pub fn payable(&self) -> &bool {
-        &self.payable
+    pub fn payable(&self) -> bool {
+        self.payable
     }
 
     /// Returns the parameters of the deployment handler.
@@ -450,8 +450,8 @@ where
         &self.docs
     }
 
-    pub fn default(&self) -> &bool {
-        &self.default
+    pub fn default(&self) -> bool {
+        self.default
     }
 }
 
@@ -743,8 +743,8 @@ where
         &self.docs
     }
 
-    pub fn default(&self) -> &bool {
-        &self.default
+    pub fn default(&self) -> bool {
+        self.default
     }
 }