GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 42b00a3758 into merged_master (Bitcoin PR bitcoin/bitcoin#22649)

Browse source
This commit is contained in:
Byron Hambly 2023-04-09 09:05:57 +00:00
commit 3fa04f26a6
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/test/fuzz/fuzz.h
View file

@ -11,6 +11,9 @@
#include <functional>
#include <string_view>
#define LIMITED_WHILE(condition, limit) \
for (unsigned _count{limit}; (condition) && _count; --_count)
using FuzzBufferType = Span<const uint8_t>;
using TypeTestOneInput = std::function<void(FuzzBufferType)>;

3
src/test/fuzz/system.cpp
View file

@ -31,7 +31,8 @@ FUZZ_TARGET(system)
SetupHelpOptions(args_manager);
}
while (fuzzed_data_provider.ConsumeBool()) {
LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 3000)
{
CallOneOf(
fuzzed_data_provider,
[&] {

2
test/functional/rpc_fundrawtransaction.py
View file

@ -1049,7 +1049,7 @@ class RawTransactionsTest(BitcoinTestFramework):
# Make sure the default wallet will not be loaded when restarted with a high minrelaytxfee
self.nodes[0].unloadwallet(self.default_wallet_name, False)
feerate = Decimal("0.1")
self.restart_node(0, [f"-minrelaytxfee={feerate}", "-discardfee=0"]) # Set high minrelayfee, set discardfee to 0 for easier calculation
self.restart_node(0, ["-maxtxfee=10000000", f"-minrelaytxfee={feerate}", "-discardfee=0"]) # Set high minrelayfee, set discardfee to 0 for easier calculation
self.nodes[0].loadwallet(self.default_wallet_name, True)
funds = self.nodes[0].get_wallet_rpc(self.default_wallet_name)