From 4cff6f80c65272c8d3ebba9b94f0a31344b243e5 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Tue, 6 Dec 2022 09:22:52 -0700 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Daira Hopwood --- src/wallet/memo.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/wallet/memo.h b/src/wallet/memo.h index 165cdadee..a8f182a34 100644 --- a/src/wallet/memo.h +++ b/src/wallet/memo.h @@ -35,7 +35,7 @@ public: // If ParseHex comes across a non-hex char, it will stop but still return results so far. size_t slen = memoHex.length(); - if (slen % 2 != 0 || (slen > 0 && rawMemo.size() != slen / 2)) { + if (slen != rawMemo.size() * 2) { return MemoError::HexDecodeError; } @@ -43,13 +43,8 @@ public: return MemoError::MemoTooLong; } - for (int i = 0; i < ZC_MEMO_SIZE; i++) { - if (i < rawMemo.size()) { - result.value[i] = rawMemo[i]; - } else { - result.value[i] = 0x0; - } - } + auto rest = std::copy(rawMemo.begin(), rawMemo.end(), result.value.begin()); + std::fill(rest, result.value.end(), 0); return result; }