Merge pull request #104 from OffchainLabs/export-infallible-methods

Export infallible methods
OffchainLabs · Feb 16, 2024 · 4c479c2 · 4c479c2
2 parents db5052f + 7524fb7
commit 4c479c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,5 +8,5 @@ Please provide a summary of the changes and any backward incompatibilities.
 - [ ] I have read the [DCO][DCO] and ensured that these changes comply.
 - [ ] I assign this work under its [open source licensing][terms].
 
-[DCO]: licenses/DCO.txt
-[terms]: licenses/COPYRIGHT.md
+[DCO]: https://github.com/OffchainLabs/stylus-sdk-rs/blob/stylus/licenses/DCO.txt
+[terms]: https://github.com/OffchainLabs/stylus-sdk-rs/blob/stylus/licenses/COPYRIGHT.md
diff --git a/stylus-proc/src/methods/external.rs b/stylus-proc/src/methods/external.rs
@@ -1,4 +1,4 @@
-// Copyright 2022-2023, Offchain Labs, Inc.
+// Copyright 2022-2024, Offchain Labs, Inc.
 // For licensing, see https://github.com/OffchainLabs/stylus-sdk-rs/blob/stylus/licenses/COPYRIGHT.md
 
 use crate::types::{self, Purity};

diff --git a/stylus-sdk/src/abi/internal.rs b/stylus-sdk/src/abi/internal.rs
@@ -1,4 +1,4 @@
-// Copyright 2023, Offchain Labs, Inc.
+// Copyright 2023-2024, Offchain Labs, Inc.
 // For licensing, see https://github.com/OffchainLabs/stylus-sdk-rs/blob/stylus/licenses/COPYRIGHT.md
 
 //! This module provides functions for code generated by `stylus-sdk-proc`.
@@ -58,12 +58,14 @@ pub fn failed_to_decode_arguments(err: alloy_sol_types::Error) {
 
 pub trait AbiResult {
     type OkType;
-    type ErrType;
 }
 
 impl<O, E> AbiResult for Result<O, E> {
     type OkType = O;
-    type ErrType = E;
+}
+
+impl<T: AbiType> AbiResult for T {
+    type OkType = T;
 }
 
 pub fn write_solidity_returns<T: AbiResult>(f: &mut fmt::Formatter) -> fmt::Result

diff --git a/stylus-sdk/src/storage/map.rs b/stylus-sdk/src/storage/map.rs
@@ -186,7 +186,7 @@ impl StorageKey for String {
 
 impl StorageKey for Address {
     fn to_slot(&self, root: B256) -> U256 {
-        let int: U160 = self.0.try_into().unwrap();
+        let int: U160 = self.0.into();
         int.to_slot(root)
     }
 }