revert

psgreco · psgreco · commit 3ca9aa3da6ed · 2025-02-14T13:51:38.000-08:00
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
@@ -33,9 +33,10 @@ bool SerializeDB(Stream& stream, const Data& data)
 {
     // Write and commit header, data
     try {
-        HashedSourceWriter hashwriter{stream};
-        hashwriter << Params().MessageStart() << data;
-        stream << hashwriter.GetHash();
+        CHashWriter hasher(stream.GetType(), stream.GetVersion());
+        stream << Params().MessageStart() << data;
+        hasher << Params().MessageStart() << data;
+        stream << hasher.GetHash();
     } catch (const std::exception& e) {
         return error("%s: Serialize or I/O error - %s", __func__, e.what());
     }
diff --git a/src/addrman.cpp b/src/addrman.cpp
@@ -1171,7 +1171,8 @@ void AddrMan::Unserialize(Stream& s_)
 }
 
 // explicit instantiation
-template void AddrMan::Serialize(HashedSourceWriter<CAutoFile>& s) const;
+template void AddrMan::Serialize(CHashWriter& s) const;
+template void AddrMan::Serialize(CAutoFile& s) const;
 template void AddrMan::Serialize(CDataStream& s) const;
 template void AddrMan::Unserialize(CAutoFile& s);
 template void AddrMan::Unserialize(CHashVerifier<CAutoFile>& s);
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -597,7 +597,7 @@ class CRegTestParams : public CChainParams {
         consensus.BIP65Height = 1;  // Always active unless overridden
         consensus.BIP66Height = 1;  // Always active unless overridden
         consensus.CSVHeight = 1;    // Always active unless overridden
-        consensus.SegwitHeight = 0; // Always active unless overridden
+        consensus.SegwitHeight = 1; // Always active unless overridden
         consensus.MinBIP9WarningHeight = 0;
         consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks
diff --git a/src/hash.h b/src/hash.h
@@ -188,30 +188,6 @@ class CHashVerifier : public CHashWriter
     }
 };
 
-/** Writes data to an underlying source stream, while hashing the written data. */
-template <typename Source>
-class HashedSourceWriter : public CHashWriter
-{
-private:
-    Source& m_source;
-
-public:
-    explicit HashedSourceWriter(Source& source LIFETIMEBOUND) : CHashWriter{source.GetType(), source.GetVersion()}, m_source{source} {}
-
-    void write(Span<const std::byte> src)
-    {
-        m_source.write(src);
-        CHashWriter::write(src);
-    }
-
-    template <typename T>
-    HashedSourceWriter& operator<<(const T& obj)
-    {
-        ::Serialize(*this, obj);
-        return *this;
-    }
-};
-
 /** Compute the 256-bit hash of an object's serialization, with optional sighash byte. */
 template<typename T>
 uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL_VERSION)
diff --git a/src/logging.cpp b/src/logging.cpp
@@ -160,9 +160,7 @@ const CLogCategoryDesc LogCategories[] =
     {BCLog::VALIDATION, "validation"},
     {BCLog::I2P, "i2p"},
     {BCLog::IPC, "ipc"},
-#ifdef DEBUG_LOCKCONTENTION
     {BCLog::LOCK, "lock"},
-#endif
     {BCLog::UTIL, "util"},
     {BCLog::BLOCKSTORE, "blockstorage"},
     {BCLog::ALL, "1"},
diff --git a/src/logging.h b/src/logging.h
@@ -60,9 +60,7 @@ namespace BCLog {
         VALIDATION  = (1 << 21),
         I2P         = (1 << 22),
         IPC         = (1 << 23),
-#ifdef DEBUG_LOCKCONTENTION
         LOCK        = (1 << 24),
-#endif
         UTIL        = (1 << 25),
         BLOCKSTORE  = (1 << 26),
         ALL         = ~(uint32_t)0,
diff --git a/src/net.h b/src/net.h
@@ -13,7 +13,6 @@
 #include <crypto/siphash.h>
 #include <hash.h>
 #include <i2p.h>
-#include <logging.h>
 #include <net_permissions.h>
 #include <netaddress.h>
 #include <netbase.h>
@@ -33,7 +32,6 @@
 #include <cstdint>
 #include <deque>
 #include <functional>
-#include <list>
 #include <map>
 #include <memory>
 #include <optional>
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1621,7 +1621,7 @@ static void SoftForkDescPushBack(const CBlockIndex* blockindex, UniValue& softfo
     // BIP9 status
     bip9.pushKV("status", get_state_name(current_state));
     bip9.pushKV("since", g_versionbitscache.StateSinceHeight(blockindex->pprev, consensusParams, id));
-    bip9.pushKV("status_next", get_state_name(next_state));
+    bip9.pushKV("status-next", get_state_name(next_state));
 
     // BIP9 signalling status, if applicable
     if (has_signal) {
@@ -1813,7 +1813,7 @@ const std::vector<RPCResult> RPCHelpForDeployment{
         {RPCResult::Type::NUM, "min_activation_height", "minimum height of blocks for which the rules may be enforced"},
         {RPCResult::Type::STR, "status", "status of deployment at specified block (one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\")"},
         {RPCResult::Type::NUM, "since", "height of the first block to which the status applies"},
-        {RPCResult::Type::STR, "status_next", "status of deployment at the next block"},
+        {RPCResult::Type::STR, "status-next", "status of deployment at the next block"},
         {RPCResult::Type::OBJ, "statistics", /*optional=*/true, "numeric statistics about signalling for a softfork (only for \"started\" and \"locked_in\" status)",
         {
             {RPCResult::Type::NUM, "period", "the length in blocks of the signalling period"},
diff --git a/src/sync.h b/src/sync.h
@@ -6,11 +6,8 @@
 #ifndef BITCOIN_SYNC_H
 #define BITCOIN_SYNC_H
 
-#ifdef DEBUG_LOCKCONTENTION
 #include <logging.h>
 #include <logging/timer.h>
-#endif
-
 #include <threadsafety.h>
 #include <util/macros.h>
 
@@ -139,10 +136,8 @@ class SCOPED_LOCKABLE UniqueLock : public Base
     void Enter(const char* pszName, const char* pszFile, int nLine)
     {
         EnterCritical(pszName, pszFile, nLine, Base::mutex());
-#ifdef DEBUG_LOCKCONTENTION
         if (Base::try_lock()) return;
         LOG_TIME_MICROS_WITH_CATEGORY(strprintf("lock contention %s, %s:%d", pszName, pszFile, nLine), BCLog::LOCK);
-#endif
         Base::lock();
     }
 
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
@@ -19,17 +19,13 @@
 #include <vector>
 
 /**
- * Identical to TestingSetup but excludes lock contention logging if
- * `DEBUG_LOCKCONTENTION` is defined, as some of these tests are designed to be
- * heavily contested to trigger race conditions or other issues.
+ * Identical to TestingSetup but excludes lock contention logging, as some of
+ * these tests are designed to be heavily contested to trigger race conditions
+ * or other issues.
  */
 struct NoLockLoggingTestingSetup : public TestingSetup {
     NoLockLoggingTestingSetup()
-#ifdef DEBUG_LOCKCONTENTION
         : TestingSetup{CBaseChainParams::MAIN, /*extra_args=*/{"-debugexclude=lock"}} {}
-#else
-        : TestingSetup{CBaseChainParams::MAIN} {}
-#endif
 };
 
 BOOST_FIXTURE_TEST_SUITE(checkqueue_tests, NoLockLoggingTestingSetup)
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
@@ -441,18 +441,4 @@ BOOST_AUTO_TEST_CASE(streams_buffered_file_rand)
     fs::remove(streams_test_filename);
 }
 
-BOOST_AUTO_TEST_CASE(streams_hashed)
-{
-    CDataStream stream(SER_NETWORK, INIT_PROTO_VERSION);
-    HashedSourceWriter hash_writer{stream};
-    const std::string data{"bitcoin"};
-    hash_writer << data;
-
-    CHashVerifier hash_verifier{&stream};
-    std::string result;
-    hash_verifier >> result;
-    BOOST_CHECK_EQUAL(data, result);
-    BOOST_CHECK_EQUAL(hash_writer.GetHash(), hash_verifier.GetHash());
-}
-
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/util/syscall_sandbox.cpp b/src/util/syscall_sandbox.cpp
@@ -592,8 +592,6 @@ class SeccompPolicyBuilder
         allowed_syscalls.insert(__NR_getcwd);          // get current working directory
         allowed_syscalls.insert(__NR_getdents);        // get directory entries
         allowed_syscalls.insert(__NR_getdents64);      // get directory entries
-        allowed_syscalls.insert(__NR_inotify_rm_watch);// remove an existing watch from an inotify instance
-        allowed_syscalls.insert(__NR_linkat);          // create relative to a directory file descriptor
         allowed_syscalls.insert(__NR_lstat);           // get file status
         allowed_syscalls.insert(__NR_mkdir);           // create a directory
         allowed_syscalls.insert(__NR_newfstatat);      // get file status
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
@@ -213,7 +213,7 @@ def check_signalling_deploymentinfo_result(self, gdi_result, height, blockhash,
                     'timeout': 0x7fffffffffffffff,  # testdummy does not have a timeout so is set to the max int64 value
                     'min_activation_height': 0,
                     'status': 'started',
-                    'status_next': status_next,
+                    'status-next': status_next,
                     'since': 144,
                     'statistics': {
                         'period': 144,
@@ -233,7 +233,7 @@ def check_signalling_deploymentinfo_result(self, gdi_result, height, blockhash,
                     'timeout': 9223372036854775807,
                     'min_activation_height': 0,
                     'status': 'active',
-                    'status_next': 'active',
+                    'status-next': 'active',
                     'since': 0,
                 },
                 'height': 0,
diff --git a/test/functional/rpc_misc.py b/test/functional/rpc_misc.py
@@ -56,6 +56,9 @@ def run_test(self):
 
         self.log.info("test logging rpc and help")
 
+        # Test logging RPC returns the expected number of logging categories.
+        assert_equal(len(node.logging()), 27)
+
         # Test toggling a logging category on/off/on with the logging RPC.
         assert_equal(node.logging()['qt'], True)
         node.logging(exclude=['qt'])

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,10 @@ bool SerializeDB(Stream& stream, const Data& data)`
`33`	`33`	`{`
`34`	`34`	`// Write and commit header, data`
`35`	`35`	`try {`
`36`		`- HashedSourceWriter hashwriter{stream};`
`37`		`- hashwriter << Params().MessageStart() << data;`
`38`		`- stream << hashwriter.GetHash();`
	`36`	`+ CHashWriter hasher(stream.GetType(), stream.GetVersion());`
	`37`	`+ stream << Params().MessageStart() << data;`
	`38`	`+ hasher << Params().MessageStart() << data;`
	`39`	`+ stream << hasher.GetHash();`
`39`	`40`	`} catch (const std::exception& e) {`
`40`	`41`	`return error("%s: Serialize or I/O error - %s", __func__, e.what());`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1171,7 +1171,8 @@ void AddrMan::Unserialize(Stream& s_)`
`1171`	`1171`	`}`
`1172`	`1172`
`1173`	`1173`	`// explicit instantiation`
`1174`		`-template void AddrMan::Serialize(HashedSourceWriter<CAutoFile>& s) const;`
	`1174`	`+template void AddrMan::Serialize(CHashWriter& s) const;`
	`1175`	`+template void AddrMan::Serialize(CAutoFile& s) const;`
`1175`	`1176`	`template void AddrMan::Serialize(CDataStream& s) const;`
`1176`	`1177`	`template void AddrMan::Unserialize(CAutoFile& s);`
`1177`	`1178`	`template void AddrMan::Unserialize(CHashVerifier<CAutoFile>& s);`