Move full StdError to cosmwasm-core

CosmWasm · Apr 9, 2024 · f2bbfff · f2bbfff
1 parent fbdebe6
commit f2bbfff
Show file tree

Hide file tree

Showing 35 changed files with 424 additions and 866 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock
diff --git a/contracts/empty/Cargo.lock b/contracts/empty/Cargo.lock
diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock
diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock
diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock
diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock
diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock
diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock
diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock
diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock
diff --git a/packages/core/Cargo.toml b/packages/core/Cargo.toml
@@ -13,6 +13,7 @@ release = false
 [dependencies]
 base64 = { version = "0.22.0", default-features = false, features = ["alloc"] }
 bnum = "0.11.0"
+cosmwasm-crypto = { version = "2.0.0", path = "../crypto" }
 crc32fast = { version = "1.4.0", optional = true, default-features = false }
 derive_more = { version = "1.0.0-beta.6", default-features = false, features = ["display", "from"] }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }

diff --git a/packages/core/src/__internal.rs b/packages/core/src/__internal.rs
@@ -7,5 +7,3 @@
 //!
 
 pub use crate::__internal__forward_ref_partial_eq as forward_ref_partial_eq;
-pub use crate::errors::backtrace::impl_from_err;
-pub use crate::errors::backtrace::BT;
diff --git a/packages/core/src/errors/backtrace.rs b/packages/core/src/errors/backtrace.rs
@@ -58,21 +58,19 @@ impl Display for Stub {
 /// the target error has a `backtrace` field.
 /// This is meant as a replacement for `thiserror`'s `#[from]` attribute, which does not
 /// work with our custom backtrace wrapper.
-#[doc(hidden)]
-#[macro_export]
-macro_rules! __internal__impl_from_err {
+macro_rules! impl_from_err {
     ($from:ty, $to:ty, $map:path) => {
         impl From<$from> for $to {
             fn from(err: $from) -> Self {
                 $map {
                     source: err,
-                    backtrace: $crate::__internal::BT::capture(),
+                    backtrace: $crate::errors::backtrace::BT::capture(),
                 }
             }
         }
     };
 }
-pub use __internal__impl_from_err as impl_from_err;
+pub(crate) use impl_from_err;
 
 #[cfg(test)]
 mod tests {