refactor: Rename signal TransactionRemovedFromMempool to better describe behavior #19520

pull instagibbs wants to merge 1 commits into bitcoin:master from instagibbs:not_block changing 4 files +11 −11

instagibbs commented at 5:48 PM on July 14, 2020: member

No description provided.
DrahtBot commented at 7:00 PM on July 14, 2020: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #19572 (ZMQ: Create "sequence" notifier, enabling client-side mempool tracking by instagibbs)
- #18354 (Use shared pointers only in validation interface by bvbfan)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
DrahtBot added the label Mempool on Jul 14, 2020
DrahtBot added the label Validation on Jul 14, 2020
MarcoFalke commented at 7:10 AM on July 15, 2020: member

why not as a scripted diff?
instagibbs force-pushed on Jul 15, 2020
instagibbs commented at 2:02 PM on July 15, 2020: member

Because I had to learn the tool :smirk:

scripted-diff: Rename signal TransactionRemovedFromMempool to better describe behavior

-BEGIN VERIFY SCRIPT-
git grep -l 'TransactionRemovedFromMempool' | xargs sed -i 's/TransactionRemovedFromMempool/TransactionRemovedFromMempoolNotConfirmed/g'
-END VERIFY SCRIPT-

bf36bc9369

instagibbs force-pushed on Jul 15, 2020
fanquake renamed this:
~~Rename signal TransactionRemovedFromMempool to better describe behavior~~
refactor: Rename signal TransactionRemovedFromMempool to better describe behavior
on Jul 28, 2020

fanquake commented at 8:00 AM on July 28, 2020: member

Because I had to learn the tool 😏

Looks like you didn't do a very good job 😏

Running script for: bf36bc9369a86198c0f24871dadc168f9db6fa7c

git grep -l 'TransactionRemovedFromMempool' | xargs sed -i 's/TransactionRemovedFromMempool/TransactionRemovedFromMempoolNotConfirmed/g'

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp

index 8eec00993..4d67cac72 100644

--- a/src/wallet/wallet.cpp

+++ b/src/wallet/wallet.cpp

@@ -1829,7 +1829,7 @@ bool CWalletTx::SubmitMemoryPoolAndRelay(std::string& err_string, bool relay)

     //

     // Irrespective of the failure reason, un-marking fInMempool

     // out-of-order is incorrect - it should be unmarked when

-    // TransactionRemovedFromMempool fires.

+    // TransactionRemovedFromMempoolNotConfirmed fires.

     bool ret = pwallet->chain().broadcastTransaction(tx, pwallet->m_default_max_tx_fee, relay, err_string);

     fInMempool |= ret;

     return ret;

Failed

Also please add a PR description.

instagibbs commented at 1:24 PM on July 29, 2020: member

I'll learn the tool in a new life I guess
instagibbs closed this on Jul 29, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

refactor: Rename signal TransactionRemovedFromMempool to better describe behavior #19520

Conflicts