mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge ffb021612b into merged_master (Bitcoin PR bitcoin/bitcoin#28451)
This commit is contained in:
commit
352fbd36dc
45 changed files with 85 additions and 156 deletions
|
|
@ -276,7 +276,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
|
|||
good_data = false;
|
||||
return;
|
||||
}
|
||||
CDataStream data_stream{SER_NETWORK, PROTOCOL_VERSION};
|
||||
DataStream data_stream{};
|
||||
data_stream << TX_WITH_WITNESS(*opt_block);
|
||||
r = HexStr(data_stream);
|
||||
},
|
||||
|
|
@ -287,7 +287,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
|
|||
good_data = false;
|
||||
return;
|
||||
}
|
||||
CDataStream data_stream{SER_NETWORK, INIT_PROTO_VERSION};
|
||||
DataStream data_stream{};
|
||||
data_stream << *opt_block_header;
|
||||
r = HexStr(data_stream);
|
||||
},
|
||||
|
|
@ -311,7 +311,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
|
|||
return;
|
||||
}
|
||||
DataStream data_stream{};
|
||||
data_stream << TX_WITH_WITNESS(*opt_psbt);
|
||||
data_stream << *opt_psbt;
|
||||
r = EncodeBase64(data_stream);
|
||||
},
|
||||
[&] {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue