diff --git a/Cargo.lock b/Cargo.lock index 82a9a1df21..00d23fa76e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -577,13 +577,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] -name = "base85" -version = "2.0.0" +name = "base85rs" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36915bbaca237c626689b5bd14d02f2ba7a5a359d30a2a08be697392e3718079" -dependencies = [ - "thiserror", -] +checksum = "87678d33a2af71f019ed11f52db246ca6c5557edee2cccbe689676d1ad9c6b5a" [[package]] name = "basic-toml" @@ -3330,7 +3327,7 @@ dependencies = [ name = "importer-contract" version = "0.1.0" dependencies = [ - "base85", + "base85rs", "cosmwasm-schema", "cosmwasm-std", "cosmwasm-storage", diff --git a/tools/internal/contract-state-importer/importer-cli/src/main.rs b/tools/internal/contract-state-importer/importer-cli/src/main.rs index 2caaa2e09b..842217363c 100644 --- a/tools/internal/contract-state-importer/importer-cli/src/main.rs +++ b/tools/internal/contract-state-importer/importer-cli/src/main.rs @@ -5,7 +5,7 @@ use anyhow::bail; use clap::ArgGroup; use clap::{Args, Parser, Subcommand}; use importer_contract::contract::EmptyMessage; -use importer_contract::{base85, ExecuteMsg}; +use importer_contract::{base85rs, ExecuteMsg}; use nym_bin_common::bin_info; use nym_bin_common::logging::setup_tracing_logger; use nym_network_defaults::{setup_env, NymNetworkDetails}; @@ -255,7 +255,7 @@ async fn execute_prepare_contract( } fn approximate_size(pair: &Model) -> usize { - base85::encode(&pair.key).len() + base85::encode(&pair.value).len() + base85rs::encode(&pair.key).len() + base85rs::encode(&pair.value).len() } fn models_to_exec(data: Vec) -> ExecuteMsg { diff --git a/tools/internal/contract-state-importer/importer-contract/Cargo.toml b/tools/internal/contract-state-importer/importer-contract/Cargo.toml index 741b9e7e2e..7952b197c2 100644 --- a/tools/internal/contract-state-importer/importer-contract/Cargo.toml +++ b/tools/internal/contract-state-importer/importer-contract/Cargo.toml @@ -14,7 +14,7 @@ readme.workspace = true crate-type = ["cdylib", "rlib"] [dependencies] -base85 = "2.0.0" +base85rs = "0.1.3" cosmwasm-std = { workspace = true } cosmwasm-storage = { workspace = true } cosmwasm-schema = { workspace = true } diff --git a/tools/internal/contract-state-importer/importer-contract/src/contract.rs b/tools/internal/contract-state-importer/importer-contract/src/contract.rs index 27b241fbba..c47a31f75b 100644 --- a/tools/internal/contract-state-importer/importer-contract/src/contract.rs +++ b/tools/internal/contract-state-importer/importer-contract/src/contract.rs @@ -26,8 +26,8 @@ pub fn execute( msg: ExecuteMsg, ) -> Result { for (key, value) in msg.pairs { - let key = base85::decode(&key).unwrap(); - let value = base85::decode(&value).unwrap(); + let key = base85rs::decode(&key).unwrap(); + let value = base85rs::decode(&value).unwrap(); deps.storage.set(&key, &value); } diff --git a/tools/internal/contract-state-importer/importer-contract/src/lib.rs b/tools/internal/contract-state-importer/importer-contract/src/lib.rs index 5f736d0af3..d1ca431ab0 100644 --- a/tools/internal/contract-state-importer/importer-contract/src/lib.rs +++ b/tools/internal/contract-state-importer/importer-contract/src/lib.rs @@ -4,5 +4,5 @@ pub mod contract; pub mod msg; -pub use base85; +pub use base85rs; pub use msg::ExecuteMsg; diff --git a/tools/internal/contract-state-importer/importer-contract/src/msg.rs b/tools/internal/contract-state-importer/importer-contract/src/msg.rs index e629d9588d..bbdce88fcc 100644 --- a/tools/internal/contract-state-importer/importer-contract/src/msg.rs +++ b/tools/internal/contract-state-importer/importer-contract/src/msg.rs @@ -13,7 +13,7 @@ impl From, Vec)>> for ExecuteMsg { ExecuteMsg { pairs: raw .into_iter() - .map(|(k, v)| (base85::encode(&k), base85::encode(&v))) + .map(|(k, v)| (base85rs::encode(&k), base85rs::encode(&v))) .collect(), } }