refactor: Use HashWriter over legacy CHashWriter (via SerializeHash)

MarcoFalke · MarcoFalke · commit 99995cfe8da6 · 2023-08-25T17:09:32.000+02:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -1195,7 +1195,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                 InitError(strprintf(_("Could not parse asmap file %s"), fs::quoted(fs::PathToString(asmap_path))));
                 return false;
             }
-            const uint256 asmap_version = SerializeHash(asmap);
+            const uint256 asmap_version = (HashWriter{} << asmap).GetHash();
             LogPrintf("Using asmap version %s for IP bucketing\n", asmap_version.ToString());
         } else {
             LogPrintf("Using /16 prefix for IP bucketing\n");
diff --git a/src/netgroup.cpp b/src/netgroup.cpp
@@ -11,7 +11,7 @@ uint256 NetGroupManager::GetAsmapChecksum() const
 {
     if (!m_asmap.size()) return {};
 
-    return SerializeHash(m_asmap);
+    return (HashWriter{} << m_asmap).GetHash();
 }
 
 std::vector<unsigned char> NetGroupManager::GetGroup(const CNetAddr& address) const

Original file line number	Diff line number	Diff line change
`@@ -1195,7 +1195,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)`
`1195`	`1195`	`InitError(strprintf(_("Could not parse asmap file %s"), fs::quoted(fs::PathToString(asmap_path))));`
`1196`	`1196`	`return false;`
`1197`	`1197`	`}`
`1198`		`- const uint256 asmap_version = SerializeHash(asmap);`
	`1198`	`+ const uint256 asmap_version = (HashWriter{} << asmap).GetHash();`
`1199`	`1199`	`LogPrintf("Using asmap version %s for IP bucketing\n", asmap_version.ToString());`
`1200`	`1200`	`} else {`
`1201`	`1201`	`LogPrintf("Using /16 prefix for IP bucketing\n");`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ uint256 NetGroupManager::GetAsmapChecksum() const`
`11`	`11`	`{`
`12`	`12`	`if (!m_asmap.size()) return {};`
`13`	`13`
`14`		`- return SerializeHash(m_asmap);`
	`14`	`+ return (HashWriter{} << m_asmap).GetHash();`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`std::vector<unsigned char> NetGroupManager::GetGroup(const CNetAddr& address) const`