Export Instantiate2AddressError and make it usable

Author: webmaster128

packages/std/src/addresses.rs

@@ -7,6 +7,7 @@ use sha2::{
 use std::borrow::Cow;
 use std::fmt;
 use std::ops::Deref;
+use thiserror::Error;
 
 use crate::{binary::Binary, HexBinary};
 
@@ -275,14 +276,23 @@ impl fmt::Display for CanonicalAddr {
     }
 }
 
-#[derive(Debug)]
+#[derive(Error, Debug, PartialEq, Eq)]
 pub enum Instantiate2AddressError {
     /// Checksum must be 32 bytes
     InvalidChecksumLength,
     /// Salt must be between 1 and 64 bytes
     InvalidSaltLength,
 }
 
+impl fmt::Display for Instantiate2AddressError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Instantiate2AddressError::InvalidChecksumLength => write!(f, "invalid checksum length"),
+            Instantiate2AddressError::InvalidSaltLength => write!(f, "invalid salt length"),
+        }
+    }
+}
+
 /// Creates a contract address using the predictable address format introduced with
 /// wasmd 0.29. When using instantiate2, this is a way to precompute the address.
 /// When using instantiate, the contract address will use a different algorithm and

packages/std/src/lib.rs

@@ -26,7 +26,7 @@ mod timestamp;
 mod traits;
 mod types;
 
-pub use crate::addresses::{instantiate2_address, Addr, CanonicalAddr};
+pub use crate::addresses::{instantiate2_address, Addr, CanonicalAddr, Instantiate2AddressError};
 pub use crate::binary::Binary;
 pub use crate::coin::{coin, coins, has_coins, Coin};
 pub use crate::deps::{Deps, DepsMut, OwnedDeps};