Merge bitcoin#28671: test: Fix failing time check in rpc_net.py

fa4c683 test: Fix failing time check in rpc_net.py (MarcoFalke)

Pull request description:

  This check fails on slow runners, such as s390x qemu.

  Fix it by using mocktime.

  See bitcoin#28523 (comment)

ACKs for top commit:
  0xB10C:
    ACK fa4c683
  pinheadmz:
    ACK fa4c683
  brunoerg:
    crACK fa4c683

Tree-SHA512: 83fb534682e11e97537dc89de8c16f206f38af1a892a2d5970c02684c05eaea8fc9adba3159f16b2440ca0b3871d513a0562a6f3a38f19a5574a47be0919e42f

Author: fanquake

src/addrman.h

@@ -36,7 +36,6 @@ class InvalidAddrManVersionError : public std::ios_base::failure
 
 class AddrInfo;
 class AddrManImpl;
-class AddrInfo;
 
 /** Default for -checkaddrman */
 static constexpr int32_t DEFAULT_ADDRMAN_CONSISTENCY_CHECKS{0};

test/functional/rpc_net.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
-# Copyright (c) 2017-2020 The Bitcoin Core developers
+# Copyright (c) 2017-present The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test RPC calls related to net.
 
 Tests correspond to code in rpc/net.cpp.
 """
 
+import time
 import test_framework.messages
 from test_framework.messages import (
     MAX_PROTOCOL_MESSAGE_LENGTH,
@@ -352,9 +353,11 @@ def test_addpeeraddress(self):
 
         self.log.debug("Test that adding an address with invalid port fails")
         assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress, address="1.2.3.4", port=-1)
-        assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress,address="1.2.3.4", port=65536)
+        assert_raises_rpc_error(-1, "JSON integer out of range", self.nodes[0].addpeeraddress, address="1.2.3.4", port=65536)
 
         self.log.debug("Test that adding a valid address to the tried table succeeds")
+        self.addr_time = int(time.time())
+        node.setmocktime(self.addr_time)
         assert_equal(node.addpeeraddress(address="1.2.3.4", tried=True, port=8333), {"success": True})
         with node.assert_debug_log(expected_msgs=["CheckAddrman: new 0, tried 1, total 1 started"]):
             addrs = node.getnodeaddresses(count=0)  # getnodeaddresses re-runs the addrman checks
@@ -447,8 +450,7 @@ def check_addr_information(result, expected):
             assert_equal(result["network"], expected["network"])
             assert_equal(result["source"], expected["source"])
             assert_equal(result["source_network"], expected["source_network"])
-            # To avoid failing on slow test runners, use a 10s vspan here.
-            assert_approx(result["time"], time.time(), vspan=10)
+            assert_equal(result["time"], self.addr_time)
 
         def check_getrawaddrman_entries(expected):
             """Utility to compare a getrawaddrman result with expected addrman contents"""