Refactor/interchain core (#503)

* refactor interchain core package

* better types and interfaces

* Nit

* formatting

* Added support for custom Outcomes

* Better doc comments

* Better comments for packet results

* Fix collaterals

* Changed names

* Changelog + doc tests

* Published new cw-orch-interchain

---------

Co-authored-by: cyberhoward <cyberhoward@protonmail.com>

Author: Kayanski

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 ### Breaking
 
+- [cw-orch-interchain-core] Modify the structure and the names of the IBC analysis and following structure. 
 
 ## 0.26.0 [8. October 2024]
 

Cargo.toml

@@ -64,12 +64,12 @@ cw-orch-fns-derive = { path = "packages/macros/cw-orch-fns-derive", version = "0
 cw-orch-clone-testing = { version = "0.8.0", path = "packages/clone-testing" }
 
 # Interchain
-cw-orch-interchain = { path = "cw-orch-interchain", version = "0.6.0" }
-cw-orch-interchain-core = { path = "packages/interchain/interchain-core", version = "0.7.0" }
-cw-orch-interchain-daemon = { path = "packages/interchain/interchain-daemon", version = "0.7.0" }
-cw-orch-interchain-mock = { path = "packages/interchain/interchain-mock", version = "0.7.0" }
+cw-orch-interchain = { path = "cw-orch-interchain", version = "0.7.0" }
+cw-orch-interchain-core = { path = "packages/interchain/interchain-core", version = "0.8.0" }
+cw-orch-interchain-daemon = { path = "packages/interchain/interchain-daemon", version = "0.8.0" }
+cw-orch-interchain-mock = { path = "packages/interchain/interchain-mock", version = "0.8.0" }
 cw-orch-starship = { path = "packages/interchain/starship", version = "0.6.0" }
-cw-orch-proto = { path = "packages/interchain/proto", version = "0.7.0" }
+cw-orch-proto = { path = "packages/interchain/proto", version = "0.8.0" }
 
 
 thiserror = { version = "1.0.63" }

cw-orch-interchain/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cw-orch-interchain"
-version = "0.6.0"
+version = "0.7.0"
 authors = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }

cw-orch-interchain/examples/doc_daemon.rs

@@ -1,8 +1,6 @@
 use cw_orch::prelude::networks::{LOCAL_JUNO, LOCAL_MIGALOO, LOCAL_OSMO};
 use cw_orch::prelude::*;
-use cw_orch_interchain::{
-    ChannelCreationValidator, ChannelCreator, DaemonInterchain, InterchainEnv, Starship,
-};
+use cw_orch_interchain::prelude::*;
 
 fn create_daemon_env() -> cw_orch::anyhow::Result<DaemonInterchain> {
     // ANCHOR: DAEMON_INTERCHAIN_CREATION

cw-orch-interchain/examples/doc_mock.rs

@@ -1,5 +1,5 @@
 use cw_orch::prelude::*;
-use cw_orch_interchain::{InterchainEnv, MockInterchainEnv};
+use cw_orch_interchain::prelude::*;
 use ibc_relayer_types::core::ics24_host::identifier::PortId;
 
 fn crate_mock_env() -> cw_orch::anyhow::Result<MockInterchainEnv> {

cw-orch-interchain/examples/follow_packets_txhash.rs

@@ -3,7 +3,7 @@ use cw_orch::{
     environment::{ChainInfo, NetworkInfo},
     prelude::networks::osmosis::OSMOSIS_1,
 };
-use cw_orch_interchain_daemon::{ChannelCreationValidator, DaemonInterchain};
+use cw_orch_interchain::prelude::*;
 
 pub const NOBLE: NetworkInfo = NetworkInfo {
     chain_name: "noble",
@@ -37,7 +37,7 @@ fn follow_by_tx_hash() -> cw_orch::anyhow::Result<()> {
             src_chain.chain_id,
             "D2C5459C54B394C168B8DFA214670FF9E2A0349CCBEF149CF5CB508A5B3BCB84".to_string(),
         )?
-        .into_result()?;
+        .assert()?;
 
     Ok(())
 }

cw-orch-interchain/examples/timeout_packet.rs

@@ -1,7 +1,7 @@
 use cosmos_sdk_proto::traits::{Message, Name};
 use cw_orch::{environment::QueryHandler, prelude::*};
-use cw_orch_interchain_core::InterchainEnv;
-use cw_orch_interchain_daemon::ChannelCreator as _;
+use cw_orch_interchain::prelude::*;
+use cw_orch_interchain_core::IbcPacketOutcome;
 use cw_orch_starship::Starship;
 use ibc_proto::ibc::{
     applications::transfer::v1::{MsgTransfer, MsgTransferResponse},
@@ -59,9 +59,9 @@ fn main() -> cw_orch::anyhow::Result<()> {
 
     let result = interchain.await_packets("juno-1", tx_resp)?;
 
-    match &result.packets[0].outcome {
-        cw_orch_interchain_core::types::IbcPacketOutcome::Timeout { .. } => {}
-        cw_orch_interchain_core::types::IbcPacketOutcome::Success { .. } => {
+    match &result.packets[0] {
+        IbcPacketOutcome::Timeout { .. } => {}
+        IbcPacketOutcome::Success { .. } => {
             panic!("Expected timeout")
         }
     }

cw-orch-interchain/src/lib.rs

@@ -2,7 +2,7 @@
 #[cfg(not(target_arch = "wasm32"))]
 pub mod prelude {
     pub use cw_orch_interchain_core::{
-        types::ChannelCreationResult, IbcQueryHandler, InterchainEnv,
+        results::ChannelCreationResult, IbcQueryHandler, InterchainEnv, PacketAnalysis,
     };
     pub use cw_orch_interchain_mock::{MockBech32InterchainEnv, MockInterchainEnv};
 
@@ -20,15 +20,23 @@ pub mod prelude {
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-pub use cw_orch_interchain_core::*;
+pub mod core {
+    pub use cw_orch_interchain_core::*;
+}
 
 #[cfg(not(target_arch = "wasm32"))]
-pub use cw_orch_interchain_mock::*;
+pub mod mock {
+    pub use cw_orch_interchain_mock::*;
+}
 
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg(feature = "daemon")]
-pub use cw_orch_interchain_daemon::*;
+pub mod daemon {
+    pub use cw_orch_interchain_daemon::*;
+}
 
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg(feature = "daemon")]
-pub use cw_orch_starship::*;
+pub mod starship {
+    pub use cw_orch_starship::*;
+}

cw-orch-interchain/tests/timeout_packet_mock.rs

@@ -46,9 +46,9 @@ fn timeout_packet_mock() -> cw_orch::anyhow::Result<()> {
 
     let result = interchain.await_packets("juno-1", tx_resp)?;
 
-    match &result.packets[0].outcome {
-        cw_orch_interchain_core::types::IbcPacketOutcome::Timeout { .. } => {}
-        cw_orch_interchain_core::types::IbcPacketOutcome::Success { .. } => {
+    match &result.packets[0] {
+        cw_orch_interchain_core::IbcPacketOutcome::Timeout { .. } => {}
+        cw_orch_interchain_core::IbcPacketOutcome::Success { .. } => {
             panic!("Expected timeout")
         }
     }

packages/integrations/cw-plus/tests/interface_tests.rs

@@ -321,7 +321,7 @@ mod cw20_ics {
         msg::AllowedInfo,
     };
     use cw_orch::prelude::*;
-    use cw_orch_interchain::{env::contract_port, prelude::*};
+    use cw_orch_interchain::{core::contract_port, prelude::*};
     use cw_plus_orch::{
         cw20_base::{Cw20Base, ExecuteMsgInterfaceFns as _},
         cw20_ics20::{