scripted-diff: Use DataStream in most places
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:
12 files changed
+53
-53
No files matched your search
@@ -128,14 +128,14 @@ void PSBTOperationsDialog::broadcastTransaction()
|
||||
}
|
||||
|
||||
void PSBTOperationsDialog::copyToClipboard() {
|
||||
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
|
||||
DataStream ssTx{};
|
||||
ssTx << m_transaction_data;
|
||||
GUIUtil::setClipboard(EncodeBase64(ssTx.str()).c_str());
|
||||
showStatus(tr("PSBT copied to clipboard."), StatusLevel::INFO);
|
||||
}
|
||||
|
||||
void PSBTOperationsDialog::saveTransaction() {
|
||||
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
|
||||
DataStream ssTx{};
|
||||
ssTx << m_transaction_data;
|
||||
|
||||
QString selected_filter;
|
||||
|
||||
@@ -397,7 +397,7 @@ bool SendCoinsDialog::PrepareSendText(QString& question_string, QString& informa
|
||||
void SendCoinsDialog::presentPSBT(PartiallySignedTransaction& psbtx)
|
||||
{
|
||||
// Serialize the PSBT
|
||||
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
|
||||
DataStream ssTx{};
|
||||
ssTx << psbtx;
|
||||
GUIUtil::setClipboard(EncodeBase64(ssTx.str()).c_str());
|
||||
QMessageBox msgBox(this);
|
||||
|
||||
@@ -543,7 +543,7 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
|
||||
return false;
|
||||
}
|
||||
// Serialize the PSBT
|
||||
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
|
||||
DataStream ssTx{};
|
||||
ssTx << psbtx;
|
||||
GUIUtil::setClipboard(EncodeBase64(ssTx.str()).c_str());
|
||||
Q_EMIT message(tr("PSBT copied"), tr("Copied to clipboard", "Fee-bump PSBT saved"), CClientUIInterface::MSG_INFORMATION);
|
||||
|
||||
Reference in new issue
Block a user