Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: (scripted-diff) Merge bitcoin-core/gui#523:, 23044, 22423, 22520 #6021

Merged
merged 4 commits into from
May 18, 2024

Conversation

vijaydasmp
Copy link

bitcoin backports

@vijaydasmp vijaydasmp changed the title backport: backport: (scripted-diff) Merge bitcoin-core/gui#523:, 23044, 22423, 22520 May 15, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_3 branch 2 times, most recently from 3f6a76e to ed07131 Compare May 15, 2024 05:49
@vijaydasmp vijaydasmp marked this pull request as ready for review May 16, 2024 02:15
Copy link
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -246,12 +246,12 @@ QString ClientModel::formatClientStartupTime() const

QString ClientModel::dataDir() const
{
return GUIUtil::boostPathToQString(GetDataDir());
return GUIUtil::PathToQString(GetDataDir());
Copy link
Collaborator

@knst knst May 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PastaPastaPasta would you backport-script recognize scripted-diff: Merge https://github.com/bitcoin-core/gui/pull/523: scripted-diff: Rename func… as a correct commit title for backport?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it will yes, not as your comment shows it; cause link, but I think as commit shows it yes

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK ed07131

vijaydasmp and others added 4 commits May 18, 2024 17:54
…tions to drop mention of boost

-BEGIN VERIFY SCRIPT-
FILES=$(git ls-files src/qt)
sed -i 's/boostPathToQString/PathToQString/g' -- $FILES
sed -i 's/qstringToBoostPath/QStringToPath/g' -- $FILES
-END VERIFY SCRIPT-
fa45a13 refactor: Remove unused validation includes (MarcoFalke)

Pull request description:

  Unused includes will cause needless recompilation when headers are changed. Also, they pretend there are dependencies that don't exist.

  Fix both by removing them.

ACKs for top commit:
  laanwj:
    Code review ACK fa45a13
  theStack:
    ACK fa45a13 ♻️

Tree-SHA512: 69190fd09184b75bce34ce3f315a1817e09ea32779f9ddc2d4790c89b0887b6cebd88aba66fa054c43c9183fc66202a556d982dd7034fc389a75802d8aaac83a
…dup, cleanup, logging)

a006d7d test: add logging to wallet_listtransactions (Sebastian Falbesoner)
47915b1 test: remove unneeded/redundant code in wallet_listtransactions (Sebastian Falbesoner)
fb6c6a7 test: speedup wallet_listtransactions by whitelisting peers (immediate tx relay) (Sebastian Falbesoner)

Pull request description:

  This PR improves the test `wallet_listtransactions.py` in three ways:
  * speeds up runtime by a factor of 2-3x by using the good ol' immediate tx relay trick (`-whitelist=noban@127.0.0.1`)
  * removes unneeded/redundant code
  * adds log messages, mostly by turning comments into `self.log.info(...)` calls

ACKs for top commit:
  jonatack:
    ACK a006d7d
  kristapsk:
    ACK a006d7d

Tree-SHA512: a91a19f5ebc4d05f0b96c5419683c4c57ac0ef44b64eeb8dd550bd72296fd3a2857a3ba83f755fe4b0b3bd06439973f226070b5d0ce2dee58344dae78cb50290
… on time and mediantime

ef5e930 test: update logging and docstring in rpc_blockchain.py (Jon Atack)
d548dc7 test: replace magic values by constants in rpc_blockchain.py (Jon Atack)
78c3610 test: assert on mediantime in getblockheader and getblockchaininfo (Jon Atack)
0a9129c test: assert on the value of getblockchaininfo#time (Jon Atack)

Pull request description:

  Follow-up to bitcoin#22407 improving test coverage per bitcoin#22407 (review).

ACKs for top commit:
  tryphe:
    untested ACK ef5e930

Tree-SHA512: f746d56f430331bc6a2ea7ecd27b21b06275927966aacf1f1127d8d5fdfd930583cabe72e23df3adb2e005da904fc05dc573b8e5eaa2f86e0e193b89a17a5734
@PastaPastaPasta PastaPastaPasta merged commit 644f00f into dashpay:develop May 18, 2024
4 of 5 checks passed
@UdjinM6 UdjinM6 added this to the 21 milestone May 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants