From e9f7cb700ed84dccb667a621a5ad6f972637ef8c Mon Sep 17 00:00:00 2001 From: Marco Granelli Date: Fri, 23 Aug 2024 18:24:51 +0200 Subject: [PATCH 1/2] Propagates error from `is_proposal_accepted` instead of defaulting --- crates/governance/src/vp/mod.rs | 4 +--- crates/governance/src/vp/pgf.rs | 4 +--- crates/ibc/src/vp/mod.rs | 4 +--- crates/trans_token/src/vp.rs | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/crates/governance/src/vp/mod.rs b/crates/governance/src/vp/mod.rs index 31865cc52b7..1cadb0fc98a 100644 --- a/crates/governance/src/vp/mod.rs +++ b/crates/governance/src/vp/mod.rs @@ -90,9 +90,7 @@ where if is_proposal_accepted( &self.ctx.pre(), tx_data.tx.data(tx_data.cmt).unwrap_or_default().as_ref(), - ) - .unwrap_or_default() - { + )? { return Ok(()); } diff --git a/crates/governance/src/vp/pgf.rs b/crates/governance/src/vp/pgf.rs index 0b473ef96aa..f0ec7019ff3 100644 --- a/crates/governance/src/vp/pgf.rs +++ b/crates/governance/src/vp/pgf.rs @@ -65,9 +65,7 @@ where .data(batched_tx.cmt) .unwrap_or_default() .as_ref(), - ) - .unwrap_or_default() - { + )? { return Ok(()); } diff --git a/crates/ibc/src/vp/mod.rs b/crates/ibc/src/vp/mod.rs index 45d8a38cfcd..381fcbe6aad 100644 --- a/crates/ibc/src/vp/mod.rs +++ b/crates/ibc/src/vp/mod.rs @@ -157,9 +157,7 @@ where .data(batched_tx.cmt) .unwrap_or_default() .as_ref(), - ) - .unwrap_or_default() - { + )? { return Ok(()); } diff --git a/crates/trans_token/src/vp.rs b/crates/trans_token/src/vp.rs index af56a308230..a53d9bc5f71 100644 --- a/crates/trans_token/src/vp.rs +++ b/crates/trans_token/src/vp.rs @@ -77,9 +77,7 @@ where if Gov::is_proposal_accepted( &self.ctx.pre(), tx_data.tx.data(tx_data.cmt).unwrap_or_default().as_ref(), - ) - .unwrap_or_default() - { + )? { return Ok(()); } From 6db4ceb7eb605b0c58e7688554dba1e076787eb7 Mon Sep 17 00:00:00 2001 From: Marco Granelli Date: Fri, 23 Aug 2024 18:35:03 +0200 Subject: [PATCH 2/2] Changelog #3700 --- .changelog/unreleased/bug-fixes/3700-fix-error-mishandling.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/unreleased/bug-fixes/3700-fix-error-mishandling.md diff --git a/.changelog/unreleased/bug-fixes/3700-fix-error-mishandling.md b/.changelog/unreleased/bug-fixes/3700-fix-error-mishandling.md new file mode 100644 index 00000000000..e8bae11d07b --- /dev/null +++ b/.changelog/unreleased/bug-fixes/3700-fix-error-mishandling.md @@ -0,0 +1,3 @@ +- Now we propagate the error coming from + `is_proposal_accepted` instead of falling back on a default. + ([\#3700](https://github.com/anoma/namada/pull/3700)) \ No newline at end of file