Merge branch 'main' into 01/13/25-remove-unused-BadgeExternalLink

rainlanguage · Jan 20, 2025 · 6c9a515 · 6c9a515
2 parents 92b2b7e + 5f63650
commit 6c9a515
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 2 deletions.
diff --git a/crates/settings/src/deployer.rs b/crates/settings/src/deployer.rs
@@ -56,7 +56,8 @@ impl Deployer {
                 if let Some(deployer_yaml) =
                     deployers_hash.get(&StrictYaml::String(deployer_key.to_string()))
                 {
-                    return require_string(deployer_yaml, Some("network"), None);
+                    return require_string(deployer_yaml, Some("network"), None)
+                        .or_else(|_| Ok(deployer_key.to_string()));
                 }
             }
         }
@@ -301,4 +302,35 @@ deployers:
             YamlError::KeyShadowing("DuplicateDeployer".to_string())
         );
     }
+
+    #[test]
+    fn test_parse_deployer_from_yaml_network_key() {
+        let yaml = r#"
+networks:
+    mainnet:
+        rpc: https://rpc.com
+        chain-id: 1
+deployers:
+    mainnet:
+        address: 0x1234567890123456789012345678901234567890
+        network: mainnet
+"#;
+
+        let documents = vec![get_document(yaml)];
+        let network_key = Deployer::parse_network_key(documents, "mainnet").unwrap();
+        assert_eq!(network_key, "mainnet");
+
+        let yaml = r#"
+networks:
+    mainnet:
+        rpc: https://rpc.com
+        chain-id: 1
+deployers:
+    mainnet:
+        address: 0x1234567890123456789012345678901234567890
+"#;
+        let documents = vec![get_document(yaml)];
+        let network_key = Deployer::parse_network_key(documents, "mainnet").unwrap();
+        assert_eq!(network_key, "mainnet");
+    }
 }
diff --git a/crates/settings/src/orderbook.rs b/crates/settings/src/orderbook.rs
@@ -46,7 +46,8 @@ impl Orderbook {
                 if let Some(orderbook_yaml) =
                     orderbooks_hash.get(&StrictYaml::String(orderbook_key.to_string()))
                 {
-                    return require_string(orderbook_yaml, Some("network"), None);
+                    return require_string(orderbook_yaml, Some("network"), None)
+                        .or_else(|_| Ok(orderbook_key.to_string()));
                 }
             }
         }
@@ -452,4 +453,35 @@ orderbooks:
             YamlError::KeyShadowing("DuplicateOrderbook".to_string())
         );
     }
+
+    #[test]
+    fn test_parse_orderbook_from_yaml_network_key() {
+        let yaml = r#"
+networks:
+    mainnet:
+        rpc: https://rpc.com
+        chain-id: 1
+orderbooks:
+    mainnet:
+        address: 0x1234567890123456789012345678901234567890
+        network: mainnet
+"#;
+
+        let documents = vec![get_document(yaml)];
+        let network_key = Orderbook::parse_network_key(documents, "mainnet").unwrap();
+        assert_eq!(network_key, "mainnet");
+
+        let yaml = r#"
+networks:
+    mainnet:
+        rpc: https://rpc.com
+        chain-id: 1
+orderbooks:
+    mainnet:
+        address: 0x1234567890123456789012345678901234567890
+"#;
+        let documents = vec![get_document(yaml)];
+        let network_key = Orderbook::parse_network_key(documents, "mainnet").unwrap();
+        assert_eq!(network_key, "mainnet");
+    }
 }