highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 14:53:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: Allow mempool_updatefromblock.py to run on 32-bit

Browse Source
This commit is contained in:
MarcoFalke
2025-12-22 11:55:06 +01:00
parent 7f295e1d9b
commit fac5a1b10a
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/test/00_setup_env_arm.sh
View File

@@ -12,8 +12,6 @@ export PACKAGES="python3-zmq g++-arm-linux-gnueabihf libc6:armhf libstdc++6:armh
export CONTAINER_NAME=ci_arm_linux export CONTAINER_NAME=ci_arm_linux
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04" # Check that https://packages.ubuntu.com/noble/g++-arm-linux-gnueabihf (version 13.x, similar to guix) can cross-compile export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04" # Check that https://packages.ubuntu.com/noble/g++-arm-linux-gnueabihf (version 13.x, similar to guix) can cross-compile
export CI_IMAGE_PLATFORM="linux/arm64" export CI_IMAGE_PLATFORM="linux/arm64"
export RUN_UNIT_TESTS=true
export RUN_FUNCTIONAL_TESTS=false
export GOAL="install" export GOAL="install"
export CI_LIMIT_STACK_SIZE=1 export CI_LIMIT_STACK_SIZE=1
# -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1" # -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"

15
test/functional/mempool_updatefromblock.py
View File

@@ -13,7 +13,7 @@ import time
from test_framework.blocktools import create_empty_fork from test_framework.blocktools import create_empty_fork
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal, assert_raises_rpc_error from test_framework.util import assert_equal, assert_greater_than_or_equal, assert_raises_rpc_error
from test_framework.wallet import MiniWallet from test_framework.wallet import MiniWallet
from test_framework.mempool_util import DEFAULT_CLUSTER_LIMIT from test_framework.mempool_util import DEFAULT_CLUSTER_LIMIT
@@ -161,12 +161,17 @@ class MempoolUpdateFromBlockTest(BitcoinTestFramework):
# but not all, and any time parent is dropped, child is also removed # but not all, and any time parent is dropped, child is also removed
self.trigger_reorg(fork_blocks=fork_blocks) self.trigger_reorg(fork_blocks=fork_blocks)
mempool = self.nodes[0].getrawmempool() mempool = self.nodes[0].getrawmempool()
expected_parent_count = len(large_std_txs) - 2 # At least one parent must be dropped, but more may be dropped,
assert_equal(len(mempool), expected_parent_count * 2) # depending on the dynamic cost overhead.
expected_parent_count = len(large_std_txs) - 1
assert_greater_than_or_equal(expected_parent_count * 2, len(mempool))
expected_parent_count = len(mempool) // 2
parent_presence = [tx["txid"] in mempool for tx in large_std_txs]
# The txns at the end of the list, or most recently confirmed, should have been trimmed # The txns at the end of the list, or most recently confirmed, should have been trimmed
assert_equal([tx["txid"] in mempool for tx in large_std_txs], [tx["txid"] in mempool for tx in small_child_txs]) assert_equal(parent_presence, [tx["txid"] in mempool for tx in small_child_txs])
assert_equal([tx["txid"] in mempool for tx in large_std_txs], [True] * expected_parent_count + [False] * 2) assert_equal(parent_presence, [True] * expected_parent_count + [False] * (len(large_std_txs) - expected_parent_count))
def test_chainlimits_exceeded(self): def test_chainlimits_exceeded(self):
self.log.info('Check that too long chains on reorg are handled') self.log.info('Check that too long chains on reorg are handled')