DGB v8.22 merge with BTC v26.2 Fixes Part 20

Author: JaredTate

src/bench/mempool_eviction.cpp

@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 // Copyright (c) 2011-2020 The Bitcoin Core developers
-// Copyright (c) 2014-2020 The DigiByte Core developers
-=======
 // Copyright (c) 2011-2022 The DigiByte Core developers
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -23,11 +19,7 @@ static void AddTx(const CTransactionRef& tx, const CAmount& nFee, CTxMemPool& po
     unsigned int sigOpCost = 4;
     LockPoints lp;
     pool.addUnchecked(CTxMemPoolEntry(
-<<<<<<< HEAD
-        tx, nFee, nTime, nHeight,
-=======
         tx, nFee, nTime, nHeight, sequence,
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
         spendsCoinbase, sigOpCost, lp));
 }
 
@@ -119,11 +111,7 @@ static void MempoolEviction(benchmark::Bench& bench)
     tx7.vout[1].scriptPubKey = CScript() << OP_7 << OP_EQUAL;
     tx7.vout[1].nValue = 10 * COIN;
 
-<<<<<<< HEAD
-    CTxMemPool pool;
-=======
     CTxMemPool& pool = *Assert(testing_setup->m_node.mempool);
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
     LOCK2(cs_main, pool.cs);
     // Create transaction references outside the "hot loop"
     const CTransactionRef tx1_r{MakeTransactionRef(tx1)};
@@ -147,8 +135,4 @@ static void MempoolEviction(benchmark::Bench& bench)
     });
 }
 
-<<<<<<< HEAD
-BENCHMARK(MempoolEviction);
-=======
 BENCHMARK(MempoolEviction, benchmark::PriorityLevel::HIGH);
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion

src/bench/prevector.cpp

@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 // Copyright (c) 2015-2020 The Bitcoin Core developers
-// Copyright (c) 2015-2020 The DigiByte Core developers
-=======
 // Copyright (c) 2015-2022 The DigiByte Core developers
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -15,13 +11,8 @@
 #include <bench/bench.h>
 
 struct nontrivial_t {
-<<<<<<< HEAD
-    int x;
-    nontrivial_t() :x(-1) {}
-=======
     int x{-1};
     nontrivial_t() = default;
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
     SERIALIZE_METHODS(nontrivial_t, obj) { READWRITE(obj.x); }
 };
 static_assert(!std::is_trivially_default_constructible<nontrivial_t>::value,
@@ -44,35 +35,6 @@ static void PrevectorDestructor(benchmark::Bench& bench)
 
 template <typename T>
 static void PrevectorClear(benchmark::Bench& bench)
-<<<<<<< HEAD
-{
-    prevector<28, T> t0;
-    prevector<28, T> t1;
-    bench.batch(2).run([&] {
-        t0.resize(28);
-        t0.clear();
-        t1.resize(29);
-        t1.clear();
-    });
-}
-
-template <typename T>
-static void PrevectorResize(benchmark::Bench& bench)
-{
-    prevector<28, T> t0;
-    prevector<28, T> t1;
-    bench.batch(4).run([&] {
-        t0.resize(28);
-        t0.resize(0);
-        t1.resize(29);
-        t1.resize(0);
-    });
-}
-
-template <typename T>
-static void PrevectorDeserialize(benchmark::Bench& bench)
-=======
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
 {
     prevector<28, T> t0;
     prevector<28, T> t1;
@@ -119,20 +81,6 @@ static void PrevectorDeserialize(benchmark::Bench& bench)
     });
 }
 
-<<<<<<< HEAD
-#define PREVECTOR_TEST(name)                                         \
-    static void Prevector##name##Nontrivial(benchmark::Bench& bench) \
-    {                                                                \
-        Prevector##name<nontrivial_t>(bench);                        \
-    }                                                                \
-    BENCHMARK(Prevector##name##Nontrivial);                          \
-    static void Prevector##name##Trivial(benchmark::Bench& bench)    \
-    {                                                                \
-        Prevector##name<trivial_t>(bench);                           \
-    }                                                                \
-    BENCHMARK(Prevector##name##Trivial);
-
-=======
 template <typename T>
 static void PrevectorFillVectorDirect(benchmark::Bench& bench)
 {
@@ -168,14 +116,9 @@ static void PrevectorFillVectorIndirect(benchmark::Bench& bench)
         Prevector##name<trivial_t>(bench);                           \
     }                                                                \
     BENCHMARK(Prevector##name##Trivial, benchmark::PriorityLevel::HIGH);
-
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
 PREVECTOR_TEST(Clear)
 PREVECTOR_TEST(Destructor)
 PREVECTOR_TEST(Resize)
 PREVECTOR_TEST(Deserialize)
-<<<<<<< HEAD
-=======
 PREVECTOR_TEST(FillVectorDirect)
 PREVECTOR_TEST(FillVectorIndirect)
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion

src/bench/rollingbloom.cpp

@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 // Copyright (c) 2016-2020 The Bitcoin Core developers
-// Copyright (c) 2016-2020 The DigiByte Core developers
-=======
 // Copyright (c) 2016-2022 The DigiByte Core developers
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -12,11 +8,7 @@
 #include <common/bloom.h>
 #include <crypto/common.h>
 
-<<<<<<< HEAD
-=======
 #include <vector>
-
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
 static void RollingBloom(benchmark::Bench& bench)
 {
     CRollingBloomFilter filter(120000, 0.000001);
@@ -27,14 +19,7 @@ static void RollingBloom(benchmark::Bench& bench)
         WriteLE32(data.data(), count);
         filter.insert(data);
 
-<<<<<<< HEAD
-        data[0] = count >> 24;
-        data[1] = count >> 16;
-        data[2] = count >> 8;
-        data[3] = count;
-=======
         WriteBE32(data.data(), count);
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
         filter.contains(data);
     });
 }
@@ -47,10 +32,5 @@ static void RollingBloomReset(benchmark::Bench& bench)
     });
 }
 
-<<<<<<< HEAD
-BENCHMARK(RollingBloom);
-BENCHMARK(RollingBloomReset);
-=======
 BENCHMARK(RollingBloom, benchmark::PriorityLevel::HIGH);
 BENCHMARK(RollingBloomReset, benchmark::PriorityLevel::HIGH);
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion

src/bench/verify_script.cpp

@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 // Copyright (c) 2016-2020 The Bitcoin Core developers
-// Copyright (c) 2016-2020 The DigiByte Core developers
-=======
 // Copyright (c) 2016-2022 The DigiByte Core developers
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -13,11 +9,7 @@
 #include <script/digibyteconsensus.h>
 #endif
 #include <script/script.h>
-<<<<<<< HEAD
-#include <script/standard.h>
-=======
 #include <script/interpreter.h>
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
 #include <streams.h>
 #include <test/util/transaction_utils.h>
 
@@ -27,16 +19,9 @@
 // modified to measure performance of other types of scripts.
 static void VerifyScriptBench(benchmark::Bench& bench)
 {
-<<<<<<< HEAD
-    const ECCVerifyHandle verify_handle;
-    ECC_Start();
-
-    const int flags = SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH;
-=======
     ECC_Start();
 
     const uint32_t flags{SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH};
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion
     const int witnessversion = 0;
 
     // Key pair.
@@ -111,10 +96,5 @@ static void VerifyNestedIfScript(benchmark::Bench& bench)
     });
 }
 
-<<<<<<< HEAD
-BENCHMARK(VerifyScriptBench);
-BENCHMARK(VerifyNestedIfScript);
-=======
 BENCHMARK(VerifyScriptBench, benchmark::PriorityLevel::HIGH);
 BENCHMARK(VerifyNestedIfScript, benchmark::PriorityLevel::HIGH);
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion

src/common/bloom.cpp

@@ -1,9 +1,4 @@
-<<<<<<< HEAD:src/bloom.cpp
-// Copyright (c) 2012-2020 The Bitcoin Core developers
-// Copyright (c) 2014-2020 The DigiByte Core developers
-=======
 // Copyright (c) 2012-2022 The DigiByte Core developers
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.cpp
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -24,15 +19,8 @@
 #include <limits>
 #include <vector>
 
-<<<<<<< HEAD:src/bloom.cpp
-#include <algorithm>
-
-#define LN2SQUARED 0.4804530139182014246671025263266649717305529515945455
-#define LN2 0.6931471805599453094172321214581765680755001343602552
-=======
 static constexpr double LN2SQUARED = 0.4804530139182014246671025263266649717305529515945455;
 static constexpr double LN2 = 0.6931471805599453094172321214581765680755001343602552;
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.cpp
 
 CBloomFilter::CBloomFilter(const unsigned int nElements, const double nFPRate, const unsigned int nTweakIn, unsigned char nFlagsIn) :
     /**
@@ -52,11 +40,7 @@ CBloomFilter::CBloomFilter(const unsigned int nElements, const double nFPRate, c
 {
 }
 
-<<<<<<< HEAD:src/bloom.cpp
-inline unsigned int CBloomFilter::Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const
-=======
 inline unsigned int CBloomFilter::Hash(unsigned int nHashNum, Span<const unsigned char> vDataToHash) const
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.cpp
 {
     // 0xFBA4C795 chosen as it guarantees a reasonable bit difference between nHashNum values.
     return MurmurHash3(nHashNum * 0xFBA4C795 + nTweak, vDataToHash) % (vData.size() * 8);
@@ -83,15 +67,6 @@ void CBloomFilter::insert(const COutPoint& outpoint)
 
 bool CBloomFilter::contains(Span<const unsigned char> vKey) const
 {
-<<<<<<< HEAD:src/bloom.cpp
-    std::vector<unsigned char> data(hash.begin(), hash.end());
-    insert(data);
-}
-
-bool CBloomFilter::contains(const std::vector<unsigned char>& vKey) const
-{
-=======
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.cpp
     if (vData.empty()) // Avoid divide-by-zero (CVE-2013-5700)
         return true;
     for (unsigned int i = 0; i < nHashFuncs; i++)
@@ -108,18 +83,7 @@ bool CBloomFilter::contains(const COutPoint& outpoint) const
 {
     DataStream stream{};
     stream << outpoint;
-<<<<<<< HEAD:src/bloom.cpp
-    std::vector<unsigned char> data(stream.begin(), stream.end());
-    return contains(data);
-}
-
-bool CBloomFilter::contains(const uint256& hash) const
-{
-    std::vector<unsigned char> data(hash.begin(), hash.end());
-    return contains(data);
-=======
     return contains(MakeUCharSpan(stream));
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.cpp
 }
 
 bool CBloomFilter::IsWithinSizeConstraints() const

src/common/bloom.h

@@ -1,19 +1,9 @@
-<<<<<<< HEAD:src/bloom.h
-// Copyright (c) 2012-2020 The Bitcoin Core developers
-// Copyright (c) 2014-2020 The DigiByte Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef DIGIBYTE_BLOOM_H
-#define DIGIBYTE_BLOOM_H
-=======
 // Copyright (c) 2012-2021 The DigiByte Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #ifndef DIGIBYTE_COMMON_BLOOM_H
 #define DIGIBYTE_COMMON_BLOOM_H
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.h
 
 #include <serialize.h>
 #include <span.h>
@@ -59,11 +49,7 @@ class CBloomFilter
     unsigned int nTweak;
     unsigned char nFlags;
 
-<<<<<<< HEAD:src/bloom.h
-    unsigned int Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const;
-=======
     unsigned int Hash(unsigned int nHashNum, Span<const unsigned char> vDataToHash) const;
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.h
 
 public:
     /**
@@ -80,19 +66,11 @@ class CBloomFilter
 
     SERIALIZE_METHODS(CBloomFilter, obj) { READWRITE(obj.vData, obj.nHashFuncs, obj.nTweak, obj.nFlags); }
 
-<<<<<<< HEAD:src/bloom.h
-    void insert(const std::vector<unsigned char>& vKey);
-=======
     void insert(Span<const unsigned char> vKey);
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.h
     void insert(const COutPoint& outpoint);
 
     bool contains(Span<const unsigned char> vKey) const;
     bool contains(const COutPoint& outpoint) const;
-<<<<<<< HEAD:src/bloom.h
-    bool contains(const uint256& hash) const;
-=======
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.h
 
     //! True if the size is <= MAX_BLOOM_FILTER_SIZE and the number of hash functions is <= MAX_HASH_FUNCS
     //! (catch a filter which was just deserialized which was too big)
@@ -146,8 +124,4 @@ class CRollingBloomFilter
     int nHashFuncs;
 };
 
-<<<<<<< HEAD:src/bloom.h
-#endif // DIGIBYTE_BLOOM_H
-=======
 #endif // DIGIBYTE_COMMON_BLOOM_H
->>>>>>> bitcoin-v26-2-converted/digibyte-v26.2-naming-conversion:src/common/bloom.h