highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-04 06:12:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripted-diff: Use DataStream in most places

Browse Source 
The remaining places are handled easier outside a scripted-diff.

-BEGIN VERIFY SCRIPT-
 sed --regexp-extended -i 's/CDataStream ([0-9a-zA-Z_]+)\(SER_[A-Z]+, [A-Z_]+_VERSION\);/DataStream \1{};/g' $( git grep -l CDataStream)
 sed -i 's/, CDataStream/, DataStream/g' src/wallet/walletdb.cpp
-END VERIFY SCRIPT-
This commit is contained in:
MarcoFalke
2023-11-19 14:58:00 +01:00
parent fac39b56b7
commit fae76a1f2a
12 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/rpc/rawtransaction.cpp
View File

@@ -1493,7 +1493,7 @@ static RPCHelpMan combinepsbt()
throw JSONRPCTransactionError(error);
}
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
DataStream ssTx{};
ssTx << merged_psbt;
return EncodeBase64(ssTx);
},
@@ -1538,7 +1538,7 @@ static RPCHelpMan finalizepsbt()
bool complete = FinalizeAndExtractPSBT(psbtx, mtx);
UniValue result(UniValue::VOBJ);
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
DataStream ssTx{};
std::string result_str;
if (complete && extract) {
@@ -1589,7 +1589,7 @@ static RPCHelpMan createpsbt()
}
// Serialize the PSBT
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
DataStream ssTx{};
ssTx << psbtx;
return EncodeBase64(ssTx);
@@ -1656,7 +1656,7 @@ static RPCHelpMan converttopsbt()
}
// Serialize the PSBT
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
DataStream ssTx{};
ssTx << psbtx;
return EncodeBase64(ssTx);
@@ -1703,7 +1703,7 @@ static RPCHelpMan utxoupdatepsbt()
/*sighash_type=*/SIGHASH_ALL,
/*finalize=*/false);
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
DataStream ssTx{};
ssTx << psbtx;
return EncodeBase64(ssTx);
},
@@ -1804,7 +1804,7 @@ static RPCHelpMan joinpsbts()
}
shuffled_psbt.unknown.insert(merged_psbt.unknown.begin(), merged_psbt.unknown.end());
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
DataStream ssTx{};
ssTx << shuffled_psbt;
return EncodeBase64(ssTx);
},
@@ -1984,7 +1984,7 @@ RPCHelpMan descriptorprocesspsbt()
complete &= PSBTInputSigned(input);
}
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
DataStream ssTx{};
ssTx << psbtx;
UniValue result(UniValue::VOBJ);