From b117eb148678b0fc5be02346cef29d87d4f81af9 Mon Sep 17 00:00:00 2001 From: fanquake Date: Sat, 24 Oct 2020 16:25:56 +0800 Subject: net: remove SetMaxOutboundTimeframe This was introduced in 872fee3fccc8b33b9af0a401b5f85ac5504b57eb and it's unclear if it's ever been used. --- src/net.cpp | 12 ------------ src/net.h | 3 --- src/test/fuzz/connman.cpp | 9 +++------ 3 files changed, 3 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/net.cpp b/src/net.cpp index 519717e46c..2250bc0530 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2885,18 +2885,6 @@ uint64_t CConnman::GetMaxOutboundTimeLeftInCycle() return (cycleEndTime < now) ? 0 : cycleEndTime - GetTime(); } -void CConnman::SetMaxOutboundTimeframe(uint64_t timeframe) -{ - LOCK(cs_totalBytesSent); - if (nMaxOutboundTimeframe != timeframe) - { - // reset measure-cycle in case of changing - // the timeframe - nMaxOutboundCycleStartTime = GetTime(); - } - nMaxOutboundTimeframe = timeframe; -} - bool CConnman::OutboundTargetReached(bool historicalBlockServingLimit) { LOCK(cs_totalBytesSent); diff --git a/src/net.h b/src/net.h index dc841d1b11..fd47b5db6a 100644 --- a/src/net.h +++ b/src/net.h @@ -367,9 +367,6 @@ public: ServiceFlags GetLocalServices() const; uint64_t GetMaxOutboundTarget(); - - //!set the timeframe for the max outbound target - void SetMaxOutboundTimeframe(uint64_t timeframe); uint64_t GetMaxOutboundTimeframe(); //! check if the outbound target is reached diff --git a/src/test/fuzz/connman.cpp b/src/test/fuzz/connman.cpp index 4afaf9def0..af85e7be4c 100644 --- a/src/test/fuzz/connman.cpp +++ b/src/test/fuzz/connman.cpp @@ -31,7 +31,7 @@ void test_one_input(const std::vector& buffer) CSubNet random_subnet; std::string random_string; while (fuzzed_data_provider.ConsumeBool()) { - switch (fuzzed_data_provider.ConsumeIntegralInRange(0, 29)) { + switch (fuzzed_data_provider.ConsumeIntegralInRange(0, 28)) { case 0: random_address = ConsumeAddress(fuzzed_data_provider); break; @@ -127,15 +127,12 @@ void test_one_input(const std::vector& buffer) connman.SetBestHeight(fuzzed_data_provider.ConsumeIntegral()); break; case 26: - connman.SetMaxOutboundTimeframe(fuzzed_data_provider.ConsumeIntegral()); - break; - case 27: connman.SetNetworkActive(fuzzed_data_provider.ConsumeBool()); break; - case 28: + case 27: connman.SetServices(random_service, static_cast(fuzzed_data_provider.ConsumeIntegral())); break; - case 29: + case 28: connman.SetTryNewOutboundPeer(fuzzed_data_provider.ConsumeBool()); break; } -- cgit v1.2.3