feat(law): instantiate with sub message store

bdeneux · amimart · commit 8819c3824d82 · 2023-03-23T15:49:56.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/cw-law-stone/Cargo.toml b/contracts/cw-law-stone/Cargo.toml
@@ -30,6 +30,7 @@ rpath = false
 cosmwasm-schema.workspace = true
 cosmwasm-std.workspace = true
 cosmwasm-storage.workspace = true
+cw-storage = { path = "../cw-storage" }
 cw-storage-plus.workspace = true
 cw2.workspace = true
 logic-bindings = { version = "0.2", path = "../../packages/logic-bindings" }
diff --git a/contracts/cw-law-stone/src/contract.rs b/contracts/cw-law-stone/src/contract.rs
@@ -1,8 +1,12 @@
 use crate::ContractError::NotImplemented;
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
-use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError, StdResult};
+use cosmwasm_std::{
+    to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError, StdResult, SubMsg,
+    WasmMsg,
+};
 use cw2::set_contract_version;
+use cw_storage::msg::ExecuteMsg as StorageMsg;
 use logic_bindings::LogicCustomQuery;
 
 use crate::error::ContractError;
@@ -12,16 +16,32 @@ use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
 const CONTRACT_NAME: &str = "crates.io:law-stone";
 const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
 
+const STORE_PROGRAM_REPLY_ID: u64 = 1;
+
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn instantiate(
     deps: DepsMut<'_, LogicCustomQuery>,
     _env: Env,
     _info: MessageInfo,
-    _msg: InstantiateMsg,
+    msg: InstantiateMsg,
 ) -> Result<Response, ContractError> {
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
 
-    Err(NotImplemented {})
+    let store_msg = StorageMsg::StoreObject {
+        data: msg.program,
+        pin: true,
+    };
+
+    let store_program_msg = WasmMsg::Execute {
+        contract_addr: msg.storage_address,
+        msg: to_binary(&store_msg)?,
+        funds: vec![],
+    };
+
+    Ok(Response::new().add_submessage(SubMsg::reply_on_success(
+        store_program_msg,
+        STORE_PROGRAM_REPLY_ID,
+    )))
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
@@ -42,37 +62,46 @@ pub fn query(_deps: Deps<'_>, _env: Env, _msg: QueryMsg) -> StdResult<Binary> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::state::LAW;
     use cosmwasm_std::testing::{mock_env, mock_info, MockQuerierCustomHandlerResult};
-    use cosmwasm_std::{ to_binary, SystemResult, SystemError};
-    use logic_bindings::{Answer, AskResponse, LogicCustomQuery, Substitution, Term, Result as LogicResult};
+    use cosmwasm_std::{from_binary, to_binary, CosmosMsg, SystemError, SystemResult};
     use logic_bindings::testing::mock::mock_dependencies_with_logic_handler;
+    use logic_bindings::{
+        Answer, AskResponse, LogicCustomQuery, Result as LogicResult, Substitution, Term,
+    };
 
-    fn custom_logic_handler_with_dependencies(dependencies: Vec<String>, request: &LogicCustomQuery) -> MockQuerierCustomHandlerResult {
+    fn custom_logic_handler_with_dependencies(
+        dependencies: Vec<String>,
+        request: &LogicCustomQuery,
+    ) -> MockQuerierCustomHandlerResult {
         let deps_name = format!("[{}]", &dependencies.join(","));
         match request {
-            LogicCustomQuery::Ask {
-                query,
-                ..
-            } if query == "source_files(Files)." => SystemResult::Ok(to_binary(&AskResponse {
-                height: 1,
-                gas_used: 1000,
-                answer: Some(Answer {
-                    success: true,
-                    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![],
-                            },
-                        }],
-                    }],
-                }),
-            }).into()),
-            _ => SystemResult::Err(SystemError::InvalidRequest { error: "Ask `souces_files(Files).` predicate not called".to_string(), request: Default::default() })
+            LogicCustomQuery::Ask { query, .. } if query == "source_files(Files)." => {
+                SystemResult::Ok(
+                    to_binary(&AskResponse {
+                        height: 1,
+                        gas_used: 1000,
+                        answer: Some(Answer {
+                            success: true,
+                            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![],
+                                    },
+                                }],
+                            }],
+                        }),
+                    })
+                    .into(),
+                )
+            }
+            _ => SystemResult::Err(SystemError::InvalidRequest {
+                error: "Ask `souces_files(Files).` predicate not called".to_string(),
+                request: Default::default(),
+            }),
         }
     }
 
@@ -81,19 +110,36 @@ mod tests {
         let mut deps = mock_dependencies_with_logic_handler(|request| {
             custom_logic_handler_with_dependencies(vec!["file1".to_string()], request)
         });
+        let program = to_binary("foo(_) :- true.").unwrap();
 
         let msg = InstantiateMsg {
-            program: Default::default(),
-            storage_address: "okp41ffzp0xmjhwkltuxcvccl0z9tyfuu7txp5ke0tpkcjpzuq9fcj3pqrteqt3".to_string(),
+            program: program.clone(),
+            storage_address: "okp41ffzp0xmjhwkltuxcvccl0z9tyfuu7txp5ke0tpkcjpzuq9fcj3pqrteqt3"
+                .to_string(),
         };
         let info = mock_info("creator", &[]);
 
         let res = instantiate(deps.as_mut(), mock_env(), info, msg).unwrap();
-        assert_eq!(0, res.messages.len());
 
-        // check internal state too
-        let law = LAW.load(&deps.storage).unwrap();
-        assert_eq!(law.program.storage_address, "okp41ffzp0xmjhwkltuxcvccl0z9tyfuu7txp5ke0tpkcjpzuq9fcj3pqrteqt3".to_string());
-        assert_eq!(law.dependencies, vec!["file1".to_string()]);
+        // Check if a message is send to the cw-storage to store the logic program.
+        assert_eq!(1, res.messages.len());
+        let sub_msg = res.messages.first().unwrap();
+        assert_eq!(STORE_PROGRAM_REPLY_ID, sub_msg.id);
+        match &sub_msg.msg {
+            CosmosMsg::Wasm(wasm_msg) => match wasm_msg {
+                WasmMsg::Execute { msg, .. } => {
+                    let result: StorageMsg = from_binary(msg).unwrap();
+                    match result {
+                        StorageMsg::StoreObject { data, pin } => {
+                            assert_eq!(data, program);
+                            assert!(pin);
+                        }
+                        _ => assert!(false, "storage message should be a StoreObject message"),
+                    }
+                }
+                _ => assert!(false, "wasm message should be a Storage message"),
+            },
+            _ => assert!(false, "cosmos sub message should be a Wasm message execute"),
+        }
     }
 }
diff --git a/contracts/cw-law-stone/src/state.rs b/contracts/cw-law-stone/src/state.rs
@@ -13,6 +13,7 @@ pub struct Law {
 }
 
 /// Represent a link to an Object stored in the `cw-storage` contract.
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct Object {
     /// The object id in the `cw-storage` contract.
     pub object_id: String,
diff --git a/packages/logic-bindings/src/testing/mock.rs b/packages/logic-bindings/src/testing/mock.rs
@@ -13,9 +13,12 @@ pub fn mock_dependencies_with_logic_and_balance(
     mock_dependencies_with_logic_and_balances(&[(MOCK_CONTRACT_ADDR, contract_balance)])
 }
 
-pub fn mock_dependencies_with_logic_handler<LH: 'static>(handler: LH) -> OwnedDeps<MockStorage, MockApi, MockQuerier<LogicCustomQuery>, LogicCustomQuery>
-    where
-        LH: Fn(&LogicCustomQuery) -> QuerierResult,  {
+pub fn mock_dependencies_with_logic_handler<LH: 'static>(
+    handler: LH,
+) -> OwnedDeps<MockStorage, MockApi, MockQuerier<LogicCustomQuery>, LogicCustomQuery>
+where
+    LH: Fn(&LogicCustomQuery) -> QuerierResult,
+{
     OwnedDeps {
         storage: MockStorage::default(),
         api: MockApi::default(),

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ pub struct Law {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	/// Represent a link to an Object stored in the `cw-storage` contract.
	`16`	`+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]`
`16`	`17`	`pub struct Object {`
`17`	`18`	/// The object id in the `cw-storage` contract.
`18`	`19`	`pub object_id: String,`