working tests

Author: hard-nett

contracts/usb/src/contract.rs

@@ -6,7 +6,7 @@ use crate::{
     APP_VERSION, USB_ID,
 };
 
-use abstract_app::AppContract;
+use abstract_app::AppContract;       
 use cosmwasm_std::Response;
 
 /// The type of the result returned by your app's entry points.

contracts/usb/src/handlers/execute.rs

@@ -36,7 +36,6 @@ pub fn execute_handler(
     // only admin can run this
     // app.admin.assert_admin(deps.as_ref(), &info.sender)?;
     match msg {
-        UsbExecuteMsg::UpdateConfig {} => update_config(deps, info, app),
         UsbExecuteMsg::JackalMsgs { msgs } => send_content(deps, info, msgs, app),
     }
 }
@@ -230,7 +229,7 @@ fn send_content(deps: DepsMut, info: MessageInfo, msgs: Vec<JackalMsg>, mut app:
     let send_as_proxy: CosmosMsg = wasm_execute(
         app.ibc_client(deps.as_ref()).module_address()?,
         &ibc_client::ExecuteMsg::RemoteAction {
-            host_chain: ChainName::from_string(JUNO[0].to_string())?.to_string(),
+            host_chain: ChainName::from_string("jackal".to_string())?.to_string(),
             action: HostAction::Dispatch {
                 manager_msgs: vec![manager::ExecuteMsg::ExecOnModule {
                     module_id: PROXY.to_string(),
@@ -252,32 +251,4 @@ fn send_content(deps: DepsMut, info: MessageInfo, msgs: Vec<JackalMsg>, mut app:
     )?;
 
     Ok(app.response("send_content").add_submessage(msg))
-}
-
-// pub(crate) fn route_msg(app: Usb, sender: Addr, msg: JackalMsg) -> UsbResult<CosmosMsg> {
-
-//     // let current_module_info = ModuleInfo::from_id(app.module_id(), app.version().into())?;
-//     // // Call IBC client
-//     // let ibc_client_msg = ibc_client::ExecuteMsg::ModuleIbcAction {
-//     //     host_chain: ChainName::from_string("jackal".to_string())?.to_string(),
-//     //     target_module: current_module_info,
-//     //     msg: to_json_binary(&ServerIbcMessage::RouteMessage { msg, header })?,
-//     //     callback_info: None,
-//     // };
-
-//     // let ibc_client_addr: Addr = app
-//     //     .module_registry(deps.as_ref())?
-//     //     .query_module(ModuleInfo::from_id_latest(IBC_CLIENT)?)?
-//     //     .reference
-//     //     .unwrap_native()?;
-
-//     // let msg: CosmosMsg = wasm_execute(ibc_client_addr, &ibc_client_msg, vec![])?.into();
-// }
-
-/// Update the configuration of the app
-fn update_config(deps: DepsMut, msg_info: MessageInfo, app: Usb) -> UsbResult {
-    // Only the admin should be able to call this
-    app.admin.assert_admin(deps.as_ref(), &msg_info.sender)?;
-
-    Ok(app.response("update_config"))
-}
+}

contracts/usb/src/msg.rs

@@ -1,6 +1,7 @@
 use crate::contract::Usb;
 
 use cosmwasm_schema::QueryResponses;
+use cosmwasm_std::Addr;
 use usb::JackalMsg;
 
 // This is used for type safety and re-exporting the contract endpoint structs.
@@ -15,10 +16,7 @@ pub struct UsbInstantiateMsg {}
 #[derive(cw_orch::ExecuteFns)]
 #[impl_into(ExecuteMsg)]
 pub enum UsbExecuteMsg {
-    JackalMsgs {
-        msgs: Vec<JackalMsg>,
-    },
-    UpdateConfig {},
+    JackalMsgs { msgs: Vec<JackalMsg> },
 }
 
 #[cosmwasm_schema::cw_serde]

contracts/usb/tests/integration.rs

@@ -107,20 +107,50 @@ mod basic_functions {
         jkl_env.enable_ibc()?;
 
         // d. Connect Chains To Each Other
-        ibc_connect_polytone_and_abstract(&interchain, "juno-1", "jackal-1")?;
+        let ibc_client = ibc_connect_polytone_and_abstract(&interchain, "juno-1", "jackal-1")?;
 
         let bs_client = bs_env.client1;
         let jkl_client = jkl_env.client1;
 
-        bs_client.account().set_ibc_status(true)?;
-
         let msg = JackalMsg::MakeRoot {
             editors: "test".to_string(),
             viewers: "test".to_string(),
             tracking_number: "test".to_string(),
         };
+        let msg2 = JackalMsg::PostKey {
+            key: "test".to_string(),
+        };
+        let msg3 = JackalMsg::AddViewers {
+            viewer_ids: "test".to_string(),
+            viewer_keys: "test".to_string(),
+            address: "test".to_string(),
+            owner: "test".to_string(),
+        };
+        let msg4 = JackalMsg::BuyStorage {
+            for_address: "test".to_string(),
+            duration_days: 30,
+            bytes: 0,
+            payment_denom: "uterp".to_string(),
+        };
+        let msg5 = JackalMsg::CancelContract {
+            cid: "test".to_string(),
+        };
+        let msg6 = JackalMsg::SignContract {
+            cid: "test".to_string(),
+        };
+        let msg7 = JackalMsg::UpgradeStorage {
+            for_address: "test".to_string(),
+            duration_days: 30,
+            bytes: 0,
+            payment_denom: "ubtsg".to_string(),
+        };
+        let msg9 = JackalMsg::DeleteViewers {
+            viewer_ids: "test".to_string(),
+            address: "test".to_string(),
+            owner: "test".to_string(),
+        };
 
-        bs_client.jackal_msgs(vec![msg])?;
+        bs_client.jackal_msgs(vec![msg, msg2, msg3, msg4, msg5, msg6, msg7,msg9])?;
 
         Ok(())
     }
@@ -148,7 +178,8 @@ pub fn ibc_connect_polytone_and_abstract<Chain: IbcQueryHandler, IBC: Interchain
         None, // Unordered channel
     )?;
     // Create the connection between client and host
-    abstract_ibc_connection_with(&abstr_origin, interchain, &abstr_remote, &origin_polytone)?;
+    let addr =
+        abstract_ibc_connection_with(&abstr_origin, interchain, &abstr_remote, &origin_polytone)?;
 
     Ok(())
 }