Merge branch 'main' into evalir/readd-pecorino

Author: Evalir

crates/constants/src/types/environment.rs

@@ -49,11 +49,10 @@ impl SignetEnvironmentConstants {
     }
 }
 
-impl FromStr for SignetEnvironmentConstants {
-    type Err = ParseChainError;
+impl TryFrom<KnownChains> for SignetEnvironmentConstants {
+    type Error = ParseChainError;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let chain: KnownChains = s.parse()?;
+    fn try_from(chain: KnownChains) -> Result<Self, Self::Error> {
         match chain {
             KnownChains::Pecorino => Ok(Self::pecorino()),
             #[cfg(any(test, feature = "test-utils"))]
@@ -62,6 +61,14 @@ impl FromStr for SignetEnvironmentConstants {
     }
 }
 
+impl FromStr for SignetEnvironmentConstants {
+    type Err = ParseChainError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<KnownChains>()?.try_into()
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

crates/constants/src/types/mod.rs

@@ -221,11 +221,10 @@ impl SignetSystemConstants {
     }
 }
 
-impl FromStr for SignetSystemConstants {
-    type Err = ParseChainError;
+impl TryFrom<KnownChains> for SignetSystemConstants {
+    type Error = ParseChainError;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let chain: KnownChains = s.parse()?;
+    fn try_from(chain: KnownChains) -> Result<Self, Self::Error> {
         match chain {
             KnownChains::Pecorino => Ok(Self::pecorino()),
             #[cfg(any(test, feature = "test-utils"))]
@@ -234,6 +233,14 @@ impl FromStr for SignetSystemConstants {
     }
 }
 
+impl FromStr for SignetSystemConstants {
+    type Err = ParseChainError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<KnownChains>()?.try_into()
+    }
+}
+
 /// All constants pertaining to the Signet system.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SignetConstants {
@@ -284,15 +291,22 @@ impl SignetConstants {
     }
 }
 
-impl FromStr for SignetConstants {
-    type Err = ParseChainError;
+impl TryFrom<KnownChains> for SignetConstants {
+    type Error = ParseChainError;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let chain: KnownChains = s.parse()?;
+    fn try_from(chain: KnownChains) -> Result<Self, Self::Error> {
         match chain {
             KnownChains::Pecorino => Ok(Self::pecorino()),
             #[cfg(any(test, feature = "test-utils"))]
             KnownChains::Test => Ok(Self::test()),
         }
     }
 }
+
+impl FromStr for SignetConstants {
+    type Err = ParseChainError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<KnownChains>()?.try_into()
+    }
+}

crates/constants/src/types/rollup.rs

@@ -107,15 +107,22 @@ impl RollupConstants {
     }
 }
 
-impl FromStr for RollupConstants {
-    type Err = ParseChainError;
+impl TryFrom<KnownChains> for RollupConstants {
+    type Error = ParseChainError;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let chain: KnownChains = s.parse()?;
+    fn try_from(chain: KnownChains) -> Result<Self, Self::Error> {
         match chain {
             KnownChains::Pecorino => Ok(Self::pecorino()),
             #[cfg(any(test, feature = "test-utils"))]
             KnownChains::Test => Ok(Self::test()),
         }
     }
 }
+
+impl FromStr for RollupConstants {
+    type Err = ParseChainError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<KnownChains>()?.try_into()
+    }
+}

crates/test-utils/src/specs/host_spec.rs

@@ -411,18 +411,25 @@ impl HostBlockSpec {
     }
 }
 
-impl FromStr for HostBlockSpec {
-    type Err = ParseChainError;
+impl TryFrom<KnownChains> for HostBlockSpec {
+    type Error = ParseChainError;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let chain: KnownChains = s.parse()?;
+    fn try_from(chain: KnownChains) -> Result<Self, Self::Error> {
         match chain {
             KnownChains::Pecorino => Ok(Self::pecorino()),
             KnownChains::Test => Ok(Self::test()),
         }
     }
 }
 
+impl FromStr for HostBlockSpec {
+    type Err = ParseChainError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<KnownChains>()?.try_into()
+    }
+}
+
 fn to_receipt<T>(address: Address, t: &T) -> ReceiptEnvelope
 where
     for<'a> &'a T: Into<LogData>,

crates/test-utils/src/specs/ru_spec.rs

@@ -146,14 +146,21 @@ impl RuBlockSpec {
     }
 }
 
-impl FromStr for RuBlockSpec {
-    type Err = ParseChainError;
+impl TryFrom<KnownChains> for RuBlockSpec {
+    type Error = ParseChainError;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let chain: KnownChains = s.parse()?;
+    fn try_from(chain: KnownChains) -> Result<Self, Self::Error> {
         match chain {
             KnownChains::Pecorino => Ok(Self::pecorino()),
             KnownChains::Test => Ok(Self::test()),
         }
     }
 }
+
+impl FromStr for RuBlockSpec {
+    type Err = ParseChainError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.parse::<KnownChains>()?.try_into()
+    }
+}