thiserror and anyhow::Error now support core::Error

polytope-labs · Nov 8, 2024 · a96b0b0 · a96b0b0
1 parent e3ea582
commit a96b0b0
Show file tree

Hide file tree

Showing 17 changed files with 467 additions and 430 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -238,7 +238,9 @@ hash-db = { version = "0.16.0", default-features = false }
 memory-db = { version = "0.32.0", default-features = false }
 codec = { version = "3.1.3", package = "parity-scale-codec", default-features = false }
 log = { version = "0.4.21", default-features = false }
-anyhow = { version = "1.0.71", default-features = false }
+anyhow = { version = "1.0", default-features = false }
+derive_more = { version = "1.0", default-features = false }
+thiserror = { version = "2", default-features = false }
 alloy-rlp = { version = "0.3.7", default-features = false }
 alloy-rlp-derive = "0.3.7"
 alloy-sol-macro = "0.7.7"

diff --git a/evm/abi/Cargo.toml b/evm/abi/Cargo.toml
@@ -14,7 +14,7 @@ forge-testsuite = { workspace = true }
 
 [dependencies]
 primitive-types = { workspace = true }
-anyhow = { workspace = true }
+anyhow = { workspace = true, default-features = true }
 
 ethers = { workspace = true }
 ismp = { workspace =  true }

diff --git a/modules/consensus/grandpa/verifier/Cargo.toml b/modules/consensus/grandpa/verifier/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true, features = ["derive"]}
-anyhow = { workspace = true }
+anyhow = { workspace = true, default-features = false }
 finality-grandpa = { version = "0.16.0", features = ["derive-codec"], default-features = false }
 serde = { workspace = true, features = ["derive"] }
 derive_more = { version = "0.99.17", default-features = false, features = ["from"] }

diff --git a/modules/consensus/sync-committee/primitives/Cargo.toml b/modules/consensus/sync-committee/primitives/Cargo.toml
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "3.2.2", default-features =
 primitive-types = { version = "0.12.1", default-features = false, features = ["serde_no_std", "impl-codec"] }
 serde = { version = "1.0.185", optional = true, features = ["derive"] }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
-anyhow = {workspace = true, default-features = false}
+anyhow = { workspace = true, default-features = false}
 ark-ec = { version = "0.4.2", default-features = false }
 ark-bls12-381 = { version = "0.4.0", default-features = false }
 bls_on_arkworks = { version = "0.2.2", default-features = false }
@@ -37,4 +37,3 @@ std = [
     "serde",
     "serde-hex-utils/std"
 ]
-
diff --git a/modules/ismp/clients/bsc/Cargo.toml b/modules/ismp/clients/bsc/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 log = { version = "0.4.17", default-features = false }
-anyhow = { workspace = true }
+anyhow = { workspace = true, default-features = false }
 codec = { package = "parity-scale-codec", version = "3.1.3", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 

diff --git a/modules/ismp/core/Cargo.toml b/modules/ismp/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ismp"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 description = "Rust implementation of the interoperable state machine protocol"
 authors = ["Polytope Labs <hello@polytope.technology>"]
@@ -17,10 +17,12 @@ codec = { workspace = true }
 primitive-types = { workspace = true, features = ["codec", "scale-info", "serde_no_std"] }
 serde = { workspace = true, features = ["derive"] }
 scale-info = { workspace = true, features = ["derive"] }
-derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
+derive_more = { workspace = true, default-features = false, features = ["from", "into", "display"] }
+displaydoc = { version = "0.2", default-features = false }
 serde_json = { version = "1.0.99", default-features = false, features = ["alloc"] }
 hex = { version = "0.4.3", features = ["alloc"], default-features = false }
-anyhow = {workspace = true, default-features = false}
+anyhow = { workspace = true, default-features = false }
+thiserror = { workspace = true, default-features = false }
 serde-hex-utils = { workspace = true, default-features = false }
 
 [features]
@@ -35,5 +37,7 @@ std = [
     "hex/std",
     "serde_json/std",
     "serde-hex-utils/std",
+    "thiserror/std",
+    "displaydoc/std",
     "anyhow/std"
 ]
diff --git a/modules/ismp/core/src/error.rs b/modules/ismp/core/src/error.rs
@@ -25,16 +25,20 @@ use core::time::Duration;
 use scale_info::TypeInfo;
 
 /// Errors that may be encountered by the ISMP module
-#[derive(Debug, Eq, PartialEq, Encode, Decode, TypeInfo)]
+#[derive(Debug, Eq, PartialEq, Encode, Decode, TypeInfo, displaydoc::Display, thiserror::Error)]
 pub enum Error {
-	/// The unbonding period for the given consensus client has elapsed and can no longer process
-	/// consensus updates.
+	/**
+	 * The unbonding period for the given consensus client has elapsed and can no longer
+	 * process consensus updates.
+	 */
 	UnbondingPeriodElapsed {
 		/// The consensus client identifier
 		consensus_state_id: ConsensusStateId,
 	},
-	/// The challange period for the given consensus client has not yet elapsed and cannot process
-	/// new consensus updates in the mean time.
+	/**
+	 * The challange period for the given consensus client has not yet elapsed and cannot
+	 * process new consensus updates in the mean time.
+	 */
 	ChallengePeriodNotElapsed {
 		/// The consensus client identifier
 		state_machine_id: StateMachineId,
@@ -208,18 +212,3 @@ pub enum Error {
 		meta: Meta,
 	},
 }
-
-impl core::fmt::Display for Error {
-	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-		write!(f, "{self:?}")
-	}
-}
-
-impl core::error::Error for Error {}
-
-#[cfg(not(feature = "std"))]
-impl From<Error> for anyhow::Error {
-	fn from(value: Error) -> Self {
-		anyhow::Error::msg(value)
-	}
-}
diff --git a/modules/utils/serde/Cargo.toml b/modules/utils/serde/Cargo.toml
@@ -14,7 +14,7 @@ readme = "./README.md"
 # crates.io
 serde = { workspace = true, features = ["derive"] }
 hex = { version = "0.4.3", features = ["alloc"], default-features = false }
-anyhow = {workspace = true, default-features = false }
+anyhow = { workspace = true, default-features = false }
 
 [features]
 default = ["std"]

diff --git a/tesseract/evm/Cargo.toml b/tesseract/evm/Cargo.toml
@@ -7,14 +7,14 @@ authors = ["Polytope Labs <hello@polytope.technology>"]
 publish = false
 
 [build-dependencies]
-anyhow = "1.0.75"
+anyhow = { workspace = true }
 ethers-contract-abigen = { workspace = true }
 
 
 [dependencies]
 reqwest = { version = "0.11", features = ["json"] }
 serde = { version = "1.0.164", features = ["derive"] }
-anyhow = "1.0.75"
+anyhow = { workspace = true }
 primitive-types = "0.12.1"
 futures = "0.3.28"
 async-trait = "0.1.71"

diff --git a/tesseract/fees/Cargo.toml b/tesseract/fees/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Polytope Labs <hello@polytope.technology>"]
 publish = false
 
 [dependencies]
-anyhow = "1.0.75"
+anyhow = { workspace = true }
 async-trait = "0.1.53"
 futures = "0.3.28"
 tokio = { workspace = true, features = ["full"] }

diff --git a/tesseract/fisherman/Cargo.toml b/tesseract/fisherman/Cargo.toml
@@ -6,7 +6,7 @@ description = "A process that checks for malicious consensus updates"
 authors = ["Polytope Labs <hello@polytope.technology>"]
 
 [dependencies]
-anyhow = "1.0.75"
+anyhow = { workspace = true }
 log = "0.4.17"
 futures = "0.3.28"
 tracing = "0.1.40"

diff --git a/tesseract/integration-test/Cargo.toml b/tesseract/integration-test/Cargo.toml
@@ -16,7 +16,7 @@ pallet-hyperbridge = { workspace = true }
 pallet-ismp-demo = {workspace = true}
 
 sc-consensus-manual-seal = { workspace = true }
-anyhow = "1.0.75"
+anyhow = { workspace = true }
 tracing = "0.1.40"
 percentage = "0.1.0"
 futures = "0.3.28"

diff --git a/tesseract/messaging/Cargo.toml b/tesseract/messaging/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Polytope Labs <hello@polytope.technology>"]
 publish = false
 
 [dependencies]
-anyhow = "1.0.75"
+anyhow = { workspace = true }
 tracing = "0.1.40"
 percentage = "0.1.0"
 futures = "0.3.28"

diff --git a/tesseract/relayer/Cargo.toml b/tesseract/relayer/Cargo.toml
@@ -31,7 +31,7 @@ env_logger = "0.10.0"
 hex = "0.4.3"
 
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-anyhow = "1.0.71"
+anyhow = { workspace = true }
 futures = "0.3.28"
 serde = { version = "1.0.164", features = ["derive"] }
 json = { version = "1.0.112", package = "serde_json" }

diff --git a/tesseract/substrate/Cargo.toml b/tesseract/substrate/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 serde = { version = "1.0.164", features = ["derive"] }
-anyhow = "1.0.75"
+anyhow = { workspace = true }
 futures = "0.3.28"
 async-trait = "0.1.71"
 parking_lot = "0.12.1"

diff --git a/tesseract/telemetry/Cargo.toml b/tesseract/telemetry/Cargo.toml
@@ -15,7 +15,7 @@ serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.112"
 tower = "0.4.13"
 tower-http = { version = "0.5.1", features = ["cors"] }
-anyhow = "1.0.79"
+anyhow = { workspace = true }
 axum = "0.7.4"
 sp-core = { version = "28.0.0", features = ["full_crypto"] }
 ismp.workspace = true