From 6d690ede82d71381c6ac3dcb738824ba372b8552 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:10:09 +0100
Subject: [PATCH] merge bitcoin#23970: Remove pointless and confusing shift in
 RelayAddress

---
 src/net_processing.cpp            | 4 ++--
 test/sanitizer_suppressions/ubsan | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 99f793881c..85a9775333 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2228,8 +2228,8 @@ void PeerManagerImpl::RelayAddress(NodeId originator,
     // Relay to a limited number of other nodes
     // Use deterministic randomness to send to the same nodes for 24 hours
     // at a time so the m_addr_knowns of the chosen nodes prevent repeats
-    uint64_t hashAddr = addr.GetHash();
-    const CSipHasher hasher = m_connman.GetDeterministicRandomizer(RANDOMIZER_ID_ADDRESS_RELAY).Write(hashAddr << 32).Write((GetTime() + hashAddr) / (24 * 60 * 60));
+    const uint64_t hashAddr{addr.GetHash()};
+    const CSipHasher hasher{m_connman.GetDeterministicRandomizer(RANDOMIZER_ID_ADDRESS_RELAY).Write(hashAddr).Write((GetTime() + hashAddr) / (24 * 60 * 60))};
     FastRandomContext insecure_rand;
 
     // Relay reachable addresses to 2 peers. Unreachable addresses are relayed randomly to 1 or 2 peers.
diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
index 1fd1b38819..e1a49e9544 100644
--- a/test/sanitizer_suppressions/ubsan
+++ b/test/sanitizer_suppressions/ubsan
@@ -101,7 +101,6 @@ shift-base:arith_uint256.cpp
 shift-base:crypto/
 shift-base:hash.cpp
 shift-base:leveldb/
-shift-base:net_processing.cpp
 shift-base:streams.h
 shift-base:test/fuzz/crypto_diff_fuzz_chacha20.cpp
 shift-base:util/bip32.cpp