Fixed Master Merge Conflict

Author: stackman27

src/net.cpp

@@ -1011,40 +1011,18 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     // on all platforms.  Set it again here just to be sure.
     SetSocketNoDelay(hSocket);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     // Don't accept connections from banned peers.
     bool banned = m_banman->IsBanned(addr);
     if (!NetPermissions::HasFlag(permissionFlags, NetPermissionFlags::PF_NOBAN) && banned)
-=======
-    int bannedlevel = m_banman ? m_banman->IsBannedLevel(addr) : 0;
-
-    // Don't accept connections from banned peers.
-    if (!NetPermissions::HasFlag(permissionFlags, NetPermissionFlags::PF_NOBAN) && bannedlevel == 2)
->>>>>>> Replace automatic bans with discouragement filter
-=======
-    // Don't accept connections from banned peers.
-    bool banned = m_banman->IsBanned(addr);
-    if (!NetPermissions::HasFlag(permissionFlags, NetPermissionFlags::PF_NOBAN) && banned)
->>>>>>> Clean up separated ban/discourage interface
     {
         LogPrint(BCLog::NET, "connection from %s dropped (banned)\n", addr.ToString());
         CloseSocket(hSocket);
         return;
     }
 
     // Only accept connections from discouraged peers if our inbound slots aren't (almost) full.
-<<<<<<< HEAD
-<<<<<<< HEAD
-    bool discouraged = m_banman->IsDiscouraged(addr);
-    if (!NetPermissions::HasFlag(permissionFlags, NetPermissionFlags::PF_NOBAN) && nInbound + 1 >= nMaxInbound && discouraged)
-=======
-    if (!NetPermissions::HasFlag(permissionFlags, NetPermissionFlags::PF_NOBAN) && nInbound + 1 >= nMaxInbound && bannedlevel >= 1)
->>>>>>> Replace automatic bans with discouragement filter
-=======
     bool discouraged = m_banman->IsDiscouraged(addr);
-    if (!NetPermissions::HasFlag(permissionFlags, NetPermissionFlags::PF_NOBAN) && nInbound + 1 >= nMaxInbound && discouraged)
->>>>>>> Clean up separated ban/discourage interface
+    if (!NetPermissions::HasFlag(permissionFlags, NetPermissionFlags::PF_NOBAN) && nInbound + 1 >= nMaxInbound && discouraged) 
     {
         LogPrint(BCLog::NET, "connection from %s dropped (discouraged)\n", addr.ToString());
         CloseSocket(hSocket);

src/net_permissions.h

@@ -23,15 +23,8 @@ enum NetPermissionFlags {
     // Always relay transactions from this peer, even if already in mempool
     // Keep parameter interaction: forcerelay implies relay
     PF_FORCERELAY = (1U << 2) | PF_RELAY,
-<<<<<<< HEAD
-    // Allow getheaders during IBD and block-download after maxuploadtarget limit
-    PF_DOWNLOAD = (1U << 6),
-    // Can't be banned/disconnected/discouraged for misbehavior
-    PF_NOBAN = (1U << 4) | PF_DOWNLOAD,
-=======
     // Can't be banned/disconnected/discouraged for misbehavior
     PF_NOBAN = (1U << 4),
->>>>>>> Clean up separated ban/discourage interface
     // Can query the mempool
     PF_MEMPOOL = (1U << 5),
 

src/net_processing.cpp

@@ -1033,15 +1033,7 @@ void Misbehaving(NodeId pnode, int howmuch, const std::string& message) EXCLUSIV
     if (state->nMisbehavior >= banscore && state->nMisbehavior - howmuch < banscore)
     {
         LogPrint(BCLog::NET, "%s: %s peer=%d (%d -> %d) DISCOURAGE THRESHOLD EXCEEDED%s\n", __func__, state->name, pnode, state->nMisbehavior-howmuch, state->nMisbehavior, message_prefixed);
-<<<<<<< HEAD
-<<<<<<< HEAD
-        state->m_should_discourage = true;
-=======
-        state->fShouldBan = true;
->>>>>>> Replace automatic bans with discouragement filter
-=======
-        state->m_should_discourage = true;
->>>>>>> Clean up separated ban/discourage interface
+        state->m_should_discourage = true; 
     } else
         LogPrint(BCLog::NET, "%s: %s peer=%d (%d -> %d)%s\n", __func__, state->name, pnode, state->nMisbehavior-howmuch, state->nMisbehavior, message_prefixed);
 }
@@ -3582,28 +3574,12 @@ bool PeerLogicValidation::MaybeDiscourageAndDisconnect(CNode& pnode)
             LogPrintf("Warning: not punishing whitelisted peer %s!\n", pnode.addr.ToString());
         } else if (pnode.m_manual_connection) {
             LogPrintf("Warning: not punishing manually-connected peer %s!\n", pnode.addr.ToString());
-<<<<<<< HEAD
-<<<<<<< HEAD
-        } else if (pnode.addr.IsLocal()) {
-=======
-        else if (pnode.addr.IsLocal()) {
->>>>>>> Replace automatic bans with discouragement filter
-=======
-        } else if (pnode.addr.IsLocal()) {
->>>>>>> Clean up separated ban/discourage interface
+        } else if (pnode.addr.IsLocal()) { 
             // Disconnect but don't discourage this local node
             LogPrintf("Warning: disconnecting but not discouraging local peer %s!\n", pnode.addr.ToString());
             pnode.fDisconnect = true;
-        } else {
-<<<<<<< HEAD
-<<<<<<< HEAD
-            // Disconnect and discourage all nodes sharing the address
-=======
-            // Disconnect and ban all nodes sharing the address
->>>>>>> Replace automatic bans with discouragement filter
-=======
-            // Disconnect and discourage all nodes sharing the address
->>>>>>> Clean up separated ban/discourage interface
+        } else {  
+            // Disconnect and discourage all nodes sharing the address 
             LogPrintf("Disconnecting and discouraging peer %s!\n", pnode.addr.ToString());
             if (m_banman) {
                 m_banman->Discourage(pnode.addr);

src/rpc/blockchain.cpp

@@ -976,15 +976,7 @@ static UniValue gettxoutsetinfo(const JSONRPCRequest& request)
                 "\nReturns statistics about the unspent transaction output set.\n"
                 "Note this call may take some time.\n",
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
                     {"hash_type", RPCArg::Type::STR, /* default */ "hash_serialized_2", "Which UTXO set hash should be calculated. Options: 'hash_serialized_2' (the legacy algorithm), 'none'."},
-=======
-                    {"hash_type", RPCArg::Type::STR, /* default */ "hash_serialized_2", "Which UTXO set hash should be calculated. Options: 'hash_serialized_2' (the legacy algorithm)."},
->>>>>>> rpc: gettxoutsetinfo can specify hash_type (only legacy option for now)
-=======
-                    {"hash_type", RPCArg::Type::STR, /* default */ "hash_serialized_2", "Which UTXO set hash should be calculated. Options: 'hash_serialized_2' (the legacy algorithm), 'none'."},
->>>>>>> rpc: Add hash_type NONE to gettxoutsetinfo
                 },
                 RPCResult{
                     RPCResult::Type::OBJ, "", "",
@@ -2331,15 +2323,7 @@ UniValue dumptxoutset(const JSONRPCRequest& request)
 
         ::ChainstateActive().ForceFlushStateToDisk();
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-        if (!GetUTXOStats(&::ChainstateActive().CoinsDB(), stats, CoinStatsHashType::NONE, RpcInterruptionPoint)) {
-=======
-        if (!GetUTXOStats(&::ChainstateActive().CoinsDB(), stats, CoinStatsHashType::HASH_SERIALIZED, RpcInterruptionPoint)) {
->>>>>>> rpc: gettxoutsetinfo can specify hash_type (only legacy option for now)
-=======
-        if (!GetUTXOStats(&::ChainstateActive().CoinsDB(), stats, CoinStatsHashType::NONE, RpcInterruptionPoint)) {
->>>>>>> rpc: Add hash_type NONE to gettxoutsetinfo
+        if (!GetUTXOStats(&::ChainstateActive().CoinsDB(), stats, CoinStatsHashType::NONE, RpcInterruptionPoint)) {  
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");
         }
 

src/rpc/util.cpp

@@ -122,16 +122,8 @@ CoinStatsHashType ParseHashType(const UniValue& param, const CoinStatsHashType d
 
         if (hash_type_input == "hash_serialized_2") {
             return CoinStatsHashType::HASH_SERIALIZED;
-<<<<<<< HEAD
-<<<<<<< HEAD
         } else if (hash_type_input == "none") {
-            return CoinStatsHashType::NONE;
-=======
->>>>>>> rpc: gettxoutsetinfo can specify hash_type (only legacy option for now)
-=======
-        } else if (hash_type_input == "none") {
-            return CoinStatsHashType::NONE;
->>>>>>> rpc: Add hash_type NONE to gettxoutsetinfo
+            return CoinStatsHashType::NONE; 
         } else {
             throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%d is not a valid hash_type", hash_type_input));
         }

src/test/denialofservice_tests.cpp

@@ -344,15 +344,8 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
         LOCK2(cs_main, dummyNode.cs_sendProcessing);
         BOOST_CHECK(peerLogic->SendMessages(&dummyNode));
     }
-<<<<<<< HEAD
-<<<<<<< HEAD
-    BOOST_CHECK(banman->IsDiscouraged(addr));
-=======
-    BOOST_CHECK(banman->IsBanned(addr));
->>>>>>> Replace automatic bans with discouragement filter
-=======
-    BOOST_CHECK(banman->IsDiscouraged(addr));
->>>>>>> Clean up separated ban/discourage interface
+
+    BOOST_CHECK(banman->IsDiscouraged(addr)); 
 
     bool dummy;
     peerLogic->FinalizeNode(dummyNode.GetId(), dummy);