From 723f7d3aeba9d80f95a5c88cc66d568744d3b267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Wed, 8 Nov 2023 18:33:11 +0100 Subject: [PATCH 1/2] print eyre errors with inner errors --- apps/src/lib/config/genesis/templates.rs | 2 +- apps/src/lib/node/ledger/shell/mod.rs | 2 +- shared/src/ledger/protocol/mod.rs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/src/lib/config/genesis/templates.rs b/apps/src/lib/config/genesis/templates.rs index d4012163e80..d670cb2916e 100644 --- a/apps/src/lib/config/genesis/templates.rs +++ b/apps/src/lib/config/genesis/templates.rs @@ -669,7 +669,7 @@ pub fn load_and_validate(templates_dir: &Path) -> Option> { let transactions = read_transactions(&transactions_file); let eprintln_invalid_file = |err: &eyre::Report, name: &str| { - eprintln!("{name} file is NOT valid. Failed to read with: {err}"); + eprintln!("{name} file is NOT valid. Failed to read with: {err:?}"); }; // Check the parsing results diff --git a/apps/src/lib/node/ledger/shell/mod.rs b/apps/src/lib/node/ledger/shell/mod.rs index 4b22542ced8..050b6de3d1c 100644 --- a/apps/src/lib/node/ledger/shell/mod.rs +++ b/apps/src/lib/node/ledger/shell/mod.rs @@ -116,7 +116,7 @@ pub enum Error { Broadcaster(tokio::sync::mpsc::error::TryRecvError), #[error("Error executing proposal {0}: {1}")] BadProposal(u64, String), - #[error("Error reading wasm: {0}")] + #[error("Error reading wasm: {0:?}")] ReadingWasm(#[from] eyre::Error), #[error("Error loading wasm: {0}")] LoadingWasm(String), diff --git a/shared/src/ledger/protocol/mod.rs b/shared/src/ledger/protocol/mod.rs index d1427811273..4dff904e24d 100644 --- a/shared/src/ledger/protocol/mod.rs +++ b/shared/src/ledger/protocol/mod.rs @@ -50,7 +50,7 @@ pub enum Error { TxDecodingError(proto::Error), #[error("Transaction runner error: {0}")] TxRunnerError(vm::wasm::run::Error), - #[error(transparent)] + #[error("{0:?}")] ProtocolTxError(#[from] eyre::Error), #[error("Txs must either be encrypted or a decryption of an encrypted tx")] TxTypeError, @@ -84,13 +84,13 @@ pub enum Error { GovernanceNativeVpError(crate::ledger::governance::Error), #[error("Pgf native VP error: {0}")] PgfNativeVpError(crate::ledger::pgf::Error), - #[error("Ethereum bridge native VP error: {0}")] + #[error("Ethereum bridge native VP error: {0:?}")] EthBridgeNativeVpError(native_vp::ethereum_bridge::vp::Error), - #[error("Ethereum bridge pool native VP error: {0}")] + #[error("Ethereum bridge pool native VP error: {0:?}")] BridgePoolNativeVpError(native_vp::ethereum_bridge::bridge_pool_vp::Error), - #[error("Non usable tokens native VP error: {0}")] + #[error("Non usable tokens native VP error: {0:?}")] NutNativeVpError(native_vp::ethereum_bridge::nut::Error), - #[error("Access to an internal address {0} is forbidden")] + #[error("Access to an internal address {0:?} is forbidden")] AccessForbidden(InternalAddress), } From 859b55cd6e04b2cd45252c655e94cd5d4e1d94c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Thu, 9 Nov 2023 10:15:53 +0100 Subject: [PATCH 2/2] changelog: add #2132 --- .changelog/unreleased/improvements/2132-better-err-reports.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changelog/unreleased/improvements/2132-better-err-reports.md diff --git a/.changelog/unreleased/improvements/2132-better-err-reports.md b/.changelog/unreleased/improvements/2132-better-err-reports.md new file mode 100644 index 00000000000..492a0e5fe5d --- /dev/null +++ b/.changelog/unreleased/improvements/2132-better-err-reports.md @@ -0,0 +1,2 @@ +- Print more context from eyre error types. + ([\#2132](https://github.com/anoma/namada/pull/2132)) \ No newline at end of file