fix addresses in authorizations (#55)

* fix addresses in authorizations * fix test fail * fix * fix test
timewave-computer · Oct 8, 2024 · 61a8436 · 61a8436
1 parent 72e45b8
commit 61a8436
Show file tree

Hide file tree

Showing 16 changed files with 221 additions and 98 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -65,7 +65,6 @@ valence-reverse-splitter-service = { path = "contracts/services/reverse-splitter
 valence-account-utils              = { path = "packages/account-utils" }
 valence-astroport-utils            = { path = "packages/astroport-utils" }
 valence-authorization-utils        = { path = "packages/authorization-utils" }
-valence-local-interchaintest-utils = { path = "packages/local-interchaintest-utils" }
 valence-macros                     = { path = "packages/valence-macros" }
 valence-polytone-utils             = { path = "packages/polytone-utils" }
 valence-processor-utils            = { path = "packages/processor-utils" }

diff --git a/contracts/services/reverse-splitter/src/tests.rs b/contracts/services/reverse-splitter/src/tests.rs
@@ -259,7 +259,7 @@ fn instantiate_fails_for_zero_ratio() {
 
 #[test]
 #[should_panic(
-    expected = "Configuration error: Duplicate split 'Native(\"untrn\")|AccountAddr(\"cosmwasm1xj6u4ccauyhvylgtj82x2qqc34lk3xuzw4mujevzqyr4gj7gqsjsv4856c\")' in split config."
+    expected = "Configuration error: Duplicate split 'Native(\"untrn\")|Addr(\"cosmwasm1xj6u4ccauyhvylgtj82x2qqc34lk3xuzw4mujevzqyr4gj7gqsjsv4856c\")' in split config."
 )]
 fn instantiate_fails_for_duplicate_split() {
     let mut suite = ReverseSplitterTestSuite::default();

diff --git a/contracts/services/splitter/src/tests.rs b/contracts/services/splitter/src/tests.rs
@@ -223,7 +223,7 @@ fn instantiate_fails_for_no_split_config() {
 
 #[test]
 #[should_panic(
-    expected = "Configuration error: Duplicate split 'Native(\"untrn\")|AccountAddr(\"cosmwasm1ea6n0jqm0hj663khx7a5xklsmjgrazjp9vjeewejn84sanr0wgxq2p70xl\")' in split config."
+    expected = "Configuration error: Duplicate split 'Native(\"untrn\")|Addr(\"cosmwasm1ea6n0jqm0hj663khx7a5xklsmjgrazjp9vjeewejn84sanr0wgxq2p70xl\")' in split config."
 )]
 fn instantiate_fails_for_duplicate_split() {
     let mut suite = SplitterTestSuite::default();

diff --git a/local-interchaintest/examples/polytone.rs b/local-interchaintest/examples/polytone.rs
@@ -48,6 +48,7 @@ use valence_processor_utils::{
     msg::PolytoneContracts,
     processor::{Config, MessageBatch, ProcessorDomain},
 };
+use valence_service_utils::ServiceAccountType;
 
 const TIMEOUT_SECONDS: u64 = 15;
 const MAX_ATTEMPTS: u64 = 50;
@@ -506,7 +507,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             },
         },
         // We don't care about the execution result so we will just make it fail when ticking the processor
-        contract_address: "any".to_string(),
+        contract_address: ServiceAccountType::Addr("any".to_string()),
     };
     let mut authorization = AuthorizationInfo {
         label: "label".to_string(),

diff --git a/local-interchaintest/examples/token_swap.rs b/local-interchaintest/examples/token_swap.rs
@@ -201,7 +201,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             input_addr: base_account_1.clone(),
             splits: vec![UncheckedSplitConfig {
                 denom: UncheckedDenom::Native(token1.clone()),
-                account: ServiceAccountType::AccountAddr(base_account_2.clone()),
+                account: ServiceAccountType::Addr(base_account_2.clone()),
                 amount: UncheckedSplitAmount::FixedAmount(swap_amount.into()),
             }],
         },
@@ -228,7 +228,7 @@ fn main() -> Result<(), Box<dyn Error>> {
             input_addr: base_account_2.clone(),
             splits: vec![UncheckedSplitConfig {
                 denom: UncheckedDenom::Native(token2.clone()),
-                account: ServiceAccountType::AccountAddr(base_account_1.clone()),
+                account: ServiceAccountType::Addr(base_account_1.clone()),
                 amount: UncheckedSplitAmount::FixedAmount(swap_amount.into()),
             }],
         },

diff --git a/packages/authorization-utils/Cargo.toml b/packages/authorization-utils/Cargo.toml
@@ -12,4 +12,5 @@ cosmwasm-schema        = { workspace = true }
 neutron-sdk            = { workspace = true }
 cw-ownable             = { workspace = true }
 valence-polytone-utils = { workspace = true }
+valence-service-utils  = { workspace = true }
 serde_json             = { workspace = true }