Remove a duplicate compare and a panic from compare.rs

stellar · Sep 7, 2023 · 6a71c37 · 6a71c37
1 parent 2b7d6ea
commit 6a71c37
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/soroban-env-common/src/compare.rs b/soroban-env-common/src/compare.rs
@@ -1,7 +1,11 @@
 #[cfg(feature = "std")]
 use std::rc::Rc;
 
-use crate::{val::ValConvert, Env, Tag, Val};
+use crate::{
+    val::ValConvert,
+    xdr::{ScErrorCode, ScErrorType},
+    Env, Error, Tag, Val,
+};
 use core::cmp::Ordering;
 
 /// General trait representing the ability to compare two values of some type.
@@ -51,11 +55,9 @@ macro_rules! impl_compare_for_tuple {
 
             fn compare(&self, a: &($($T,)+), b: &($($T,)+)) -> Result<Ordering, Self::Error> {
                 $(
-                    if let Ordering::Less = <C as Compare<$T>>::compare(self, &a.$idx, &b.$idx)? {
-                        return Ok(Ordering::Less)
-                    }
-                    if let Ordering::Greater = <C as Compare<$T>>::compare(self, &a.$idx, &b.$idx)? {
-                        return Ok(Ordering::Greater)
+                    match <C as Compare<$T>>::compare(self, &a.$idx, &b.$idx)? {
+                        unequal @ (Ordering::Less | Ordering::Greater) => return Ok(unequal),
+                        _ => ()
                     }
                 )*
                 Ok(Ordering::Equal)
@@ -194,7 +196,11 @@ impl<E: Env> Compare<Val> for E {
                 | Tag::SymbolObject
                 | Tag::VecObject
                 | Tag::MapObject
-                | Tag::AddressObject => unreachable!(),
+                | Tag::AddressObject => Err(Error::from_type_and_code(
+                    ScErrorType::Context,
+                    ScErrorCode::InternalError,
+                )
+                .into()),
 
                 Tag::ObjectCodeUpperBound => Ok(Ordering::Equal),
                 Tag::Bad => Ok(Ordering::Equal),

diff --git a/soroban-env-common/src/env.rs b/soroban-env-common/src/env.rs
@@ -32,7 +32,7 @@ pub trait EnvBase: Sized + Clone {
     /// environment-interface level, and then either directly handle or escalate
     /// the contained `Error` code to the user as a `Error` or `Result<>` of
     /// some other type, depending on the API.
-    type Error: core::fmt::Debug + Into<crate::Error>;
+    type Error: core::fmt::Debug + Into<crate::Error> + From<crate::Error>;
 
     /// Reject an error from the environment, turning it into a panic but on
     /// terms that the environment controls (eg. transforming or logging it).

diff --git a/soroban-env-common/src/error.rs b/soroban-env-common/src/error.rs
@@ -286,6 +286,12 @@ impl From<core::convert::Infallible> for crate::Error {
     }
 }
 
+impl From<crate::Error> for core::convert::Infallible {
+    fn from(_value: crate::Error) -> Self {
+        unreachable!()
+    }
+}
+
 #[cfg(all(test, feature = "std"))]
 mod tests {
     use super::*;