Fix conflict and merge main

rainlanguage · Dec 30, 2024 · 0a1e9d4 · 0a1e9d4
2 parents 31b542e + d566b4b
commit 0a1e9d4
Show file tree

Hide file tree

Showing 19 changed files with 1,151 additions and 326 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
diff --git a/crates/common/src/add_order.rs b/crates/common/src/add_order.rs
@@ -484,6 +484,8 @@ price: 2e18;
         let token3_arc = Arc::new(token3);
         let known_vault_id = U256::from(1);
         let order = Order {
+            document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
+            key: "".to_string(),
             inputs: vec![
                 OrderIO {
                     token: token1_arc.clone(),
@@ -589,6 +591,8 @@ _ _: 0 0;
         let token2_arc = Arc::new(token2);
         let token3_arc = Arc::new(token3);
         let order = Order {
+            document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
+            key: "".to_string(),
             inputs: vec![
                 OrderIO {
                     token: token1_arc.clone(),
@@ -730,6 +734,8 @@ _ _: 0 0;
         let token3_arc = Arc::new(token3);
         let known_vault_id = U256::from(1);
         let order = Order {
+            document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
+            key: "".to_string(),
             inputs: vec![
                 OrderIO {
                     token: token1_arc.clone(),

diff --git a/crates/settings/src/deployment.rs b/crates/settings/src/deployment.rs
@@ -65,6 +65,8 @@ impl DeploymentConfigSource {
 mod tests {
     use super::*;
     use crate::test::*;
+    use std::sync::RwLock;
+    use strict_yaml_rust::StrictYaml;
 
     #[test]
     fn test_try_into_deployment_success() {
@@ -78,6 +80,8 @@ mod tests {
             blocks: None,
         };
         let order = Order {
+            document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
+            key: String::new(),
             inputs: vec![],
             outputs: vec![],
             network: mock_network(),
@@ -107,6 +111,8 @@ mod tests {
             blocks: None,
         };
         let order = Order {
+            document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
+            key: String::new(),
             inputs: vec![],
             outputs: vec![],
             network: mock_network(),

diff --git a/crates/settings/src/gui.rs b/crates/settings/src/gui.rs
@@ -226,12 +226,15 @@ impl_all_wasm_traits!(Gui);
 
 #[cfg(test)]
 mod tests {
+    use std::sync::RwLock;
+
     use super::*;
     use crate::{
         test::{mock_deployer, mock_network, mock_token},
         Order, Scenario,
     };
     use alloy::primitives::Address;
+    use strict_yaml_rust::StrictYaml;
 
     #[test]
     fn test_gui_creation_success() {
@@ -308,6 +311,8 @@ mod tests {
             blocks: None,
         };
         let order = Order {
+            document: Arc::new(RwLock::new(StrictYaml::String("".to_string()))),
+            key: String::new(),
             inputs: vec![],
             outputs: vec![],
             network: mock_network(),