feat: chain_id explicit

HerodotusDev · Sep 2, 2024 · 01332fc · 01332fc
1 parent 6ef1af4
commit 01332fc
Show file tree

Hide file tree

Showing 4 changed files with 770 additions and 523 deletions.
diff --git a/hdp/src/primitives/chain_id.rs b/hdp/src/primitives/chain_id.rs
@@ -57,10 +57,10 @@ impl FromStr for ChainId {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "ETH_MAINNET" => Ok(Self::EthereumMainnet),
-            "ETH_SEPOLIA" => Ok(Self::EthereumSepolia),
-            "SN_MAINNET" => Ok(Self::StarknetMainnet),
-            "SN_SEPOLIA" => Ok(Self::StarknetSepolia),
+            "ETHEREUM_MAINNET" => Ok(Self::EthereumMainnet),
+            "ETHEREUM_SEPOLIA" => Ok(Self::EthereumSepolia),
+            "STARKNET_MAINNET" => Ok(Self::StarknetMainnet),
+            "STARKNET_SEPOLIA" => Ok(Self::StarknetSepolia),
             _ => Err(ParseChainIdError {
                 input: s.to_string(),
             }),
@@ -71,21 +71,21 @@ impl FromStr for ChainId {
 impl Display for ChainId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ChainId::EthereumMainnet => write!(f, "ETH_MAINNET"),
-            ChainId::EthereumSepolia => write!(f, "ETH_SEPOLIA"),
-            ChainId::StarknetMainnet => write!(f, "SN_MAINNET"),
-            ChainId::StarknetSepolia => write!(f, "SN_SEPOLIA"),
+            ChainId::EthereumMainnet => write!(f, "ETHEREUM_MAINNET"),
+            ChainId::EthereumSepolia => write!(f, "ETHEREUM_SEPOLIA"),
+            ChainId::StarknetMainnet => write!(f, "STARKNET_MAINNET"),
+            ChainId::StarknetSepolia => write!(f, "STARKNET_SEPOLIA"),
         }
     }
 }
 
 impl Debug for ChainId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ChainId::EthereumMainnet => write!(f, "ETH_MAINNET"),
-            ChainId::EthereumSepolia => write!(f, "ETH_SEPOLIA"),
-            ChainId::StarknetMainnet => write!(f, "SN_MAINNET"),
-            ChainId::StarknetSepolia => write!(f, "SN_SEPOLIA"),
+            ChainId::EthereumMainnet => write!(f, "ETHEREUM_MAINNET"),
+            ChainId::EthereumSepolia => write!(f, "ETHEREUM_SEPOLIA"),
+            ChainId::StarknetMainnet => write!(f, "STARKNET_MAINNET"),
+            ChainId::StarknetSepolia => write!(f, "STARKNET_SEPOLIA"),
         }
     }
 }
@@ -142,30 +142,30 @@ mod tests {
     #[test]
     fn test_from_str() {
         assert_eq!(
-            ChainId::from_str("ETH_MAINNET").unwrap(),
+            ChainId::from_str("ETHEREUM_MAINNET").unwrap(),
             ChainId::EthereumMainnet
         );
         assert_eq!(
-            ChainId::from_str("ETH_SEPOLIA").unwrap(),
+            ChainId::from_str("ETHEREUM_SEPOLIA").unwrap(),
             ChainId::EthereumSepolia
         );
         assert_eq!(
-            ChainId::from_str("SN_MAINNET").unwrap(),
+            ChainId::from_str("STARKNET_MAINNET").unwrap(),
             ChainId::StarknetMainnet
         );
         assert_eq!(
-            ChainId::from_str("SN_SEPOLIA").unwrap(),
+            ChainId::from_str("STARKNET_SEPOLIA").unwrap(),
             ChainId::StarknetSepolia
         );
         assert!(ChainId::from_str("INVALID").is_err());
     }
 
     #[test]
     fn test_display() {
-        assert_eq!(ChainId::EthereumMainnet.to_string(), "ETH_MAINNET");
-        assert_eq!(ChainId::EthereumSepolia.to_string(), "ETH_SEPOLIA");
-        assert_eq!(ChainId::StarknetMainnet.to_string(), "SN_MAINNET");
-        assert_eq!(ChainId::StarknetSepolia.to_string(), "SN_SEPOLIA");
+        assert_eq!(ChainId::EthereumMainnet.to_string(), "ETHEREUM_MAINNET");
+        assert_eq!(ChainId::EthereumSepolia.to_string(), "ETHEREUM_SEPOLIA");
+        assert_eq!(ChainId::StarknetMainnet.to_string(), "STARKNET_MAINNET");
+        assert_eq!(ChainId::StarknetSepolia.to_string(), "STARKNET_SEPOLIA");
     }
 
     #[test]

diff --git a/hdp/src/primitives/request.rs b/hdp/src/primitives/request.rs
@@ -21,13 +21,13 @@ pub struct SubmitBatchQuery {
 fn test_serialize_submit_batch_query_datalake() {
     let json_data = r#"
     {
-      "destinationChainId": "ETH_SEPOLIA",
+      "destinationChainId": "ETHEREUM_SEPOLIA",
       "tasks": [
         {
           "type": "DatalakeCompute",
           "datalake": {
             "type": "BlockSampled",
-            "chainId": "ETH_SEPOLIA",
+            "chainId": "ETHEREUM_SEPOLIA",
             "blockRangeStart": 5515020,
             "blockRangeEnd": 5515039,
             "increment": 10,
@@ -41,7 +41,7 @@ fn test_serialize_submit_batch_query_datalake() {
           "type": "DatalakeCompute",
           "datalake": {
             "type": "TransactionsInBlock",
-            "chainId": "ETH_SEPOLIA",
+            "chainId": "ETHEREUM_SEPOLIA",
             "targetBlock": 5409986,
             "startIndex": 10,
             "endIndex": 40,
@@ -74,7 +74,7 @@ fn test_serialize_submit_batch_query_datalake() {
 fn test_serialize_submit_batch_query_module() {
     let json_data = r#"
    {
-    "destinationChainId": "ETH_SEPOLIA",
+    "destinationChainId": "ETHEREUM_SEPOLIA",
     "tasks": [
         {
         "type": "Module",