From b9d942f17a8847e973b824316adf01010c586fd9 Mon Sep 17 00:00:00 2001
From: yito88 <yuji@phact-columba.com>
Date: Thu, 29 Aug 2024 16:20:49 +0200
Subject: [PATCH] fix overwrite memo test

---
 crates/relayer/src/chain/namada/tx.rs        | 16 +++++++---------
 tools/test-framework/src/bootstrap/namada.rs |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/crates/relayer/src/chain/namada/tx.rs b/crates/relayer/src/chain/namada/tx.rs
index c123cfa1e9..72353877eb 100644
--- a/crates/relayer/src/chain/namada/tx.rs
+++ b/crates/relayer/src/chain/namada/tx.rs
@@ -129,15 +129,13 @@ impl NamadaChain {
         // Confirm the transaction later
         let mut tx_args = tx_args.broadcast_only(true);
 
-        let memo = if !self.config().memo_prefix.as_str().is_empty() {
-            Some(
-                self.config()
-                    .memo_prefix
-                    .as_str()
-                    .to_string()
-                    .as_bytes()
-                    .to_vec(),
-            )
+        let memo = self
+            .config()
+            .memo_overwrite
+            .as_ref()
+            .unwrap_or(&self.config().memo_prefix);
+        let memo = if !memo.as_str().is_empty() {
+            Some(memo.as_str().to_string().as_bytes().to_vec())
         } else {
             None
         };
diff --git a/tools/test-framework/src/bootstrap/namada.rs b/tools/test-framework/src/bootstrap/namada.rs
index 21dd984da1..6223486c2f 100644
--- a/tools/test-framework/src/bootstrap/namada.rs
+++ b/tools/test-framework/src/bootstrap/namada.rs
@@ -152,7 +152,7 @@ pub fn bootstrap_namada_node(
         ],
         &[("NAMADA_NETWORK_CONFIGS_DIR", genesis_path)],
     )?;
-    std::env::set_current_dir(&cur_dir)?;
+    std::env::set_current_dir(cur_dir)?;
 
     let config_path = format!("{home_path}/setup/validator-0/{chain_id}/config.toml");