Merge pull request #150 from CosmWasm/refactoring

Refactoring

Cargo.toml

@@ -2,11 +2,11 @@
 name = "cw-multi-test"
 version = "1.0.0-rc.2"
 authors = ["Ethan Frey <[email protected]>"]
-edition = "2021"
 description = "Testing tools for multi-contract interactions"
-license = "Apache-2.0"
 repository = "https://github.com/CosmWasm/cw-multi-test"
 homepage = "https://cosmwasm.com"
+license = "Apache-2.0"
+edition = "2021"
 
 [features]
 default = []

src/addresses.rs

@@ -1,4 +1,4 @@
-//! # Implementation of address generators
+//! # Implementation of address conversions and generators
 
 use crate::error::AnyResult;
 use crate::{MockApiBech32, MockApiBech32m};
@@ -21,10 +21,12 @@ pub trait IntoAddr {
 }
 
 impl IntoAddr for &str {
+    /// Converts [&str] into [Addr].
     fn into_addr(self) -> Addr {
         MockApiBech32::new(DEFAULT_PREFIX).addr_make(self)
     }
 
+    /// Converts [&str] into [Addr] with custom prefix.
     fn into_addr_with_prefix(self, prefix: &'static str) -> Addr {
         MockApiBech32::new(prefix).addr_make(self)
     }
@@ -40,10 +42,12 @@ pub trait IntoBech32 {
 }
 
 impl IntoBech32 for &str {
+    /// Converts [&str] into [Addr] containing a string compatible with `Bech32` format with default prefix.
     fn into_bech32(self) -> Addr {
         MockApiBech32::new(DEFAULT_PREFIX).addr_make(self)
     }
 
+    /// Converts [&str] into [Addr] containing a string compatible with `Bech32` format with custom prefix.
     fn into_bech32_with_prefix(self, prefix: &'static str) -> Addr {
         MockApiBech32::new(prefix).addr_make(self)
     }
@@ -58,10 +62,12 @@ pub trait IntoBech32m {
 }
 
 impl IntoBech32m for &str {
+    /// Converts [&str] into [Addr] containing a string compatible with `Bech32m` format with default prefix.
     fn into_bech32m(self) -> Addr {
         MockApiBech32m::new(DEFAULT_PREFIX).addr_make(self)
     }
 
+    /// Converts [&str] into [Addr] containing a string compatible with `Bech32m` format with custom prefix.
     fn into_bech32m_with_prefix(self, prefix: &'static str) -> Addr {
         MockApiBech32m::new(prefix).addr_make(self)
     }

src/bank.rs

@@ -23,7 +23,7 @@ const BALANCES: Map<&Addr, NativeBalance> = Map::new("balances");
 #[cfg(feature = "cosmwasm_1_3")]
 const DENOM_METADATA: Map<String, DenomMetadata> = Map::new("metadata");
 
-/// Default namespace for bank module.
+/// Default storage namespace for bank module.
 pub const NAMESPACE_BANK: &[u8] = b"bank";
 
 /// A message representing privileged actions in bank module.

src/checksums.rs

@@ -1,4 +1,4 @@
-//! # Implementation of the interface to custom checksum generator
+//! # Implementation of checksum generator
 
 use cosmwasm_std::{Addr, HexBinary};
 use sha2::{Digest, Sha256};

tests/test_api/mod.rs

@@ -4,6 +4,7 @@ use hex_literal::hex;
 mod test_addr;
 mod test_bech32;
 mod test_bech32m;
+mod test_prefixed;
 
 const SECP256K1_MSG_HASH: [u8; 32] =
     hex!("5ae8317d34d1e595e3fa7247db80c0af4320cce1116de187f8f7e2e099c0d8d0");

tests/test_api/test_prefixed.rs

@@ -0,0 +1,99 @@
+use super::*;
+use cosmwasm_std::CanonicalAddr;
+use cw_multi_test::MockApiBech32;
+
+const HUMAN_ADDRESS: &str = "juno1h34lmpywh4upnjdg90cjf4j70aee6z8qqfspugamjp42e4q28kqsksmtyp";
+
+fn api_prefix(prefix: &'static str) -> MockApiBech32 {
+    MockApiBech32::new(prefix)
+}
+
+fn api_juno() -> MockApiBech32 {
+    api_prefix("juno")
+}
+
+fn api_osmo() -> MockApiBech32 {
+    api_prefix("osmo")
+}
+
+#[test]
+fn new_api_bech32_should_work() {
+    let addr = api_juno().addr_make("creator");
+    assert_eq!(HUMAN_ADDRESS, addr.as_str(),);
+}
+
+#[test]
+fn address_validate_should_work() {
+    assert_eq!(
+        api_juno().addr_validate(HUMAN_ADDRESS).unwrap().as_str(),
+        HUMAN_ADDRESS
+    )
+}
+
+#[test]
+fn address_validate_invalid_address() {
+    api_juno().addr_validate("creator").unwrap_err();
+}
+
+#[test]
+fn addr_validate_invalid_prefix() {
+    api_juno()
+        .addr_validate(api_osmo().addr_make("creator").as_str())
+        .unwrap_err();
+}
+
+#[test]
+fn address_canonicalize_humanize_should_work() {
+    let api = api_juno();
+    assert_eq!(
+        api.addr_humanize(&api.addr_canonicalize(HUMAN_ADDRESS).unwrap())
+            .unwrap()
+            .as_str(),
+        HUMAN_ADDRESS
+    );
+}
+
+#[test]
+fn address_humanize_prefix_too_long() {
+    api_prefix(
+        "juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_",
+    )
+    .addr_humanize(&CanonicalAddr::from([1, 2, 3, 4, 5]))
+    .unwrap_err();
+}
+
+#[test]
+fn debug_should_not_panic() {
+    assert_debug_does_not_panic(&api_juno());
+}
+
+#[test]
+#[should_panic(
+    expected = "Generating address failed with reason: hrp is too long, found 85 characters, must be <= 126"
+)]
+fn address_make_prefix_too_long() {
+    api_prefix(
+        "juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_juno_",
+    )
+    .addr_make("creator");
+}
+
+#[test]
+fn secp256k1_verify_works() {
+    assert_secp256k1_verify_works(&api_juno());
+}
+
+#[test]
+fn secp256k1_recover_pubkey_works() {
+    assert_secp256k1_recover_pubkey_works(&api_juno());
+}
+
+#[test]
+fn ed25519_verify_works() {
+    assert_ed25519_verify_works(&api_juno());
+}
+
+#[test]
+fn ed25519_batch_verify_works() {
+    assert_ed25519_batch_verify_works(&api_juno());
+}