Better API and avoid exposing un-necessary dependencies

AbstractSDK · Sep 9, 2024 · 4b88338 · 4b88338
1 parent 68f1715
commit 4b88338
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 14 deletions.
diff --git a/cw-orch-daemon/src/core.rs b/cw-orch-daemon/src/core.rs
@@ -369,14 +369,24 @@ impl<Sender: TxSender> DaemonAsyncBase<Sender> {
             wasm_byte_code,
             instantiate_permission: access
                 .map(|a| {
-                    Ok::<_, DaemonError>(cosmrs::cosmwasm::AccessConfig {
-                        permission: a.permission.try_into().unwrap(),
-                        addresses: a
-                            .addresses
-                            .into_iter()
-                            .map(|a| a.parse())
-                            .collect::<Result<_, _>>()?,
-                    })
+                    let response = match a {
+                        AccessConfig::Nobody => cosmrs::cosmwasm::AccessConfig {
+                            permission: cosmrs::cosmwasm::AccessType::Nobody,
+                            addresses: vec![],
+                        },
+                        AccessConfig::Everybody => cosmrs::cosmwasm::AccessConfig {
+                            permission: cosmrs::cosmwasm::AccessType::Everybody,
+                            addresses: vec![],
+                        },
+                        AccessConfig::AnyOfAddresses(addresses) => cosmrs::cosmwasm::AccessConfig {
+                            permission: cosmrs::cosmwasm::AccessType::AnyOfAddresses,
+                            addresses: addresses
+                                .into_iter()
+                                .map(|a| a.parse())
+                                .collect::<Result<_, _>>()?,
+                        },
+                    };
+                    Ok::<_, DaemonError>(response)
                 })
                 .transpose()?,
         };

diff --git a/cw-orch/src/prelude.rs b/cw-orch/src/prelude.rs
@@ -27,8 +27,9 @@ pub use crate::environment::IndexResponse;
 
 // Environment
 pub use crate::environment::{
-    BankQuerier, BankSetter, CwEnv, DefaultQueriers, EnvironmentInfo, EnvironmentQuerier,
-    NodeQuerier, QuerierGetter, QueryHandler, TxHandler, TxResponse, WasmQuerier,
+    AccessConfig, BankQuerier, BankSetter, CwEnv, DefaultQueriers, EnvironmentInfo,
+    EnvironmentQuerier, NodeQuerier, QuerierGetter, QueryHandler, TxHandler, TxResponse,
+    WasmQuerier,
 };
 
 pub use cw_orch_core::environment::Environment;

diff --git a/packages/cw-orch-core/src/contract/contract_instance.rs b/packages/cw-orch-core/src/contract/contract_instance.rs
@@ -9,8 +9,8 @@ use crate::{
     log::{contract_target, transaction_target},
 };
 
+use crate::environment::AccessConfig;
 use crate::environment::QueryHandler;
-use cosmos_sdk_proto::cosmwasm::wasm::v1::AccessConfig;
 use cosmwasm_std::{Addr, Binary, Coin};
 use serde::{de::DeserializeOwned, Serialize};
 use std::fmt::Debug;

diff --git a/packages/cw-orch-core/src/contract/interface_traits.rs b/packages/cw-orch-core/src/contract/interface_traits.rs
@@ -1,4 +1,5 @@
 use super::{Contract, WasmPath};
+use crate::environment::AccessConfig;
 use crate::{
     environment::{
         AsyncWasmQuerier, ChainInfoOwned, ChainState, CwEnv, Environment, QueryHandler, TxHandler,
@@ -7,7 +8,6 @@ use crate::{
     error::CwEnvError,
     log::contract_target,
 };
-use cosmos_sdk_proto::cosmwasm::wasm::v1::AccessConfig;
 use cosmwasm_std::{Addr, Binary, Coin, Empty};
 use cw_multi_test::Contract as MockContract;
 use cw_storage_plus::{Item, Map, PrimaryKey};

diff --git a/packages/cw-orch-core/src/environment/tx_handler.rs b/packages/cw-orch-core/src/environment/tx_handler.rs
@@ -6,8 +6,6 @@ use cosmwasm_std::{Addr, Binary, Coin};
 use serde::Serialize;
 use std::fmt::Debug;
 
-pub use cosmos_sdk_proto::cosmwasm::wasm::v1::AccessConfig;
-
 /// Response type for actions on an environment
 pub type TxResponse<Chain> = <Chain as TxHandler>::Response;
 
@@ -90,6 +88,34 @@ pub trait TxHandler: ChainState + Clone {
     }
 }
 
+pub enum AccessConfig {
+    Nobody,
+    Everybody,
+    AnyOfAddresses(Vec<String>),
+}
+
+impl From<AccessConfig> for cosmos_sdk_proto::cosmwasm::wasm::v1::AccessConfig {
+    fn from(val: AccessConfig) -> Self {
+        match val {
+            AccessConfig::Nobody => cosmos_sdk_proto::cosmwasm::wasm::v1::AccessConfig {
+                permission: cosmos_sdk_proto::cosmwasm::wasm::v1::AccessType::Nobody.into(),
+                addresses: vec![],
+            },
+            AccessConfig::Everybody => cosmos_sdk_proto::cosmwasm::wasm::v1::AccessConfig {
+                permission: cosmos_sdk_proto::cosmwasm::wasm::v1::AccessType::Everybody.into(),
+                addresses: vec![],
+            },
+            AccessConfig::AnyOfAddresses(addresses) => {
+                cosmos_sdk_proto::cosmwasm::wasm::v1::AccessConfig {
+                    permission: cosmos_sdk_proto::cosmwasm::wasm::v1::AccessType::AnyOfAddresses
+                        .into(),
+                    addresses,
+                }
+            }
+        }
+    }
+}
+
 // TODO: Perfect test candidate for `trybuild`
 #[cfg(test)]
 mod tests {