feat(law-stone)!: update needed by new logic bindings

axone-protocol · Feb 22, 2024 · dcaef7a · dcaef7a
1 parent f1a809c
commit dcaef7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/contracts/okp4-law-stone/src/contract.rs b/contracts/okp4-law-stone/src/contract.rs
@@ -272,7 +272,7 @@ mod tests {
     use okp4_logic_bindings::testing::mock::mock_dependencies_with_logic_handler;
     use okp4_logic_bindings::uri::CosmwasmUri;
     use okp4_logic_bindings::{
-        Answer, AskResponse, LogicCustomQuery, Result as LogicResult, Substitution, Term,
+        Answer, AskResponse, LogicCustomQuery, Result as LogicResult, Substitution,
     };
     use okp4_objectarium::msg::PageInfo;
     use std::collections::VecDeque;
@@ -300,15 +300,13 @@ mod tests {
                         gas_used: 1000,
                         answer: Some(Answer {
                             success: true,
+                            error: None,
                             has_more: false,
                             variables: vec!["Files".to_string()],
                             results: vec![LogicResult {
                                 substitutions: vec![Substitution {
                                     variable: "Files".to_string(),
-                                    term: Term {
-                                        name: deps_name,
-                                        arguments: vec![],
-                                    },
+                                    expression: deps_name,
                                 }],
                             }],
                         }),
@@ -462,15 +460,13 @@ mod tests {
                     gas_used: 1000,
                     answer: Some(Answer {
                         success: true,
+                        error: None,
                         has_more: false,
                         variables: vec!["Foo".to_string()],
                         results: vec![LogicResult {
                             substitutions: vec![Substitution {
                                 variable: "Foo".to_string(),
-                                term: Term {
-                                    name: "bar".to_string(),
-                                    arguments: vec![],
-                                },
+                                expression: "bar".to_string(),
                             }],
                         }],
                     }),

diff --git a/contracts/okp4-law-stone/src/helper.rs b/contracts/okp4-law-stone/src/helper.rs
@@ -53,8 +53,7 @@ pub fn ask_response_to_objects(
         .flat_map(|r: &okp4_logic_bindings::Result| r.substitutions.clone())
         .filter(|s| s.variable == variable)
         .map(|s: Substitution| {
-            s.term
-                .parse()
+            s.parse_expression()
                 .map_err(|e| ContractError::LogicAskResponse(LogicAskResponseError::Parse(e)))
                 .and_then(term_as_vec)
         })
@@ -72,7 +71,7 @@ pub fn ask_response_to_objects(
 mod tests {
     use super::*;
     use okp4_logic_bindings::error::TermParseError;
-    use okp4_logic_bindings::{Answer, Term};
+    use okp4_logic_bindings::Answer;
 
     #[test]
     fn logic_to_objects() {
@@ -105,15 +104,13 @@ mod tests {
                             results: vec![okp4_logic_bindings::Result {
                                 substitutions: vec![Substitution {
                                     variable: "X".to_string(),
-                                    term: Term {
-                                        name: case.0,
-                                        arguments: vec![],
-                                    }
+                                    expression: case.0,
                                 }]
                             }],
                             has_more: false,
                             success: true,
                             variables: vec![],
+                            error: None,
                         }),
                         height: 1,
                         gas_used: 1,