Skip to content

Backports 0.17 pr16 #3618

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Jul 20, 2020
Merged

Backports 0.17 pr16 #3618

merged 6 commits into from
Jul 20, 2020

Conversation

@PastaPastaPasta
Copy link
Member

@PastaPastaPasta PastaPastaPasta commented Jul 18, 2020

not based on 13 14 or 15

regarding 11517, I need advise on what the remaining benchmarks should be set to. This branch won't compile til that's done.

regarding 12757 I stuck with the BITCOIN prefix, just because I don't want to have to deal with it while backporting. Once we diverge from bitcoin, changing them to DASH is just a scripted diff away

sipa and others added 5 commits July 18, 2020 03:08
@sipa @PastaPastaPasta
Merge bitcoin#13021: MOVEONLY: Move logging code from util.{h,cpp} to…
1230909 
… new files.

b77b6e2 MOVEONLY: Move logging code from util.{h,cpp} to new files. (Jim Posen)

Pull request description:

  Split out first commit from bitcoin#12954 to reduce amount of rebasing necessary.

  This introduces a cyclic dependency between `logging` and `util` that should be cleaned up in a future PR.

Tree-SHA512: 695e512f9c2f7b4ca65e367fc924358e3cb2dc531bcbb7a6f62710b2a87280b35aba7793aa272e457fcd65448abe3feb1deb3b8064ed208917ca356b0f410813
Signed-off-by: pasta <pasta@dashboost.org>

# Conflicts:
#	src/Makefile.am
#	src/util.cpp
#	src/util.h
@PastaPastaPasta
Merge bitcoin#13236: break circular dependency: random/sync -> util -…
26ca2ce 
…> random/sync

84f4194 break circular dependency: random/sync -> util -> random/sync (Chun Kuan Lee)

Pull request description:

  LogPrintf  has acutally been moved to logging.h

Tree-SHA512: a7135f5fea421e62f010f2e434873bd1c1738f115453377dada7d24900b3b095535d8aa0462c3acffdacf2f4e819e05ad39b13f2de5a36ac8f7b8467c639a0db
@PastaPastaPasta
Merge bitcoin#13228: Add script to detect circular dependencies betwe…
5103888 
…en source modules

a7b295e Add circular dependencies script (Pieter Wuille)

Pull request description:

  This script finds dependencies between source code modules, treating the `.cpp` and `.h` file as one unit (so it will detect `A.cpp` depending on `B.h` where `B.cpp` depends on `A.h`). This can be used to find out which modules cannot be used independently from each other.

  It is very simplistic at this point, and assumes that a `.cpp` file's corresponding header has the exact same name, with `.cpp` replaced by `.h`. Furthermore, it assumes all `#include`s are relative to the `src/` directory.

  This is not a linter, and is not enforced through Travis or otherwise.

  This is the current output:

  ```
  $ ../contrib/devtools/circular-dependencies.py {*,*/*,*/*/*}.{h,cpp}
  Circular dependency: chain -> pow -> chain
  Circular dependency: chainparamsbase -> util -> chainparamsbase
  Circular dependency: checkpoints -> validation -> checkpoints
  Circular dependency: init -> index/txindex -> init
  Circular dependency: init -> validation -> init
  Circular dependency: init -> net_processing -> init
  Circular dependency: init -> rpc/server -> init
  Circular dependency: init -> txdb -> init
  Circular dependency: init -> validationinterface -> init
  Circular dependency: random -> util -> random
  Circular dependency: sync -> util -> sync
  Circular dependency: txmempool -> validation -> txmempool
  Circular dependency: txmempool -> policy/fees -> txmempool
  Circular dependency: validation -> index/txindex -> validation
  Circular dependency: validation -> policy/policy -> validation
  Circular dependency: validation -> validationinterface -> validation
  Circular dependency: qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel
  Circular dependency: qt/bantablemodel -> qt/clientmodel -> qt/bantablemodel
  Circular dependency: qt/bitcoingui -> qt/walletview -> qt/bitcoingui
  Circular dependency: qt/bitcoingui -> qt/walletframe -> qt/bitcoingui
  Circular dependency: qt/bitcoingui -> qt/utilitydialog -> qt/bitcoingui
  Circular dependency: qt/clientmodel -> qt/peertablemodel -> qt/clientmodel
  Circular dependency: qt/paymentserver -> qt/walletmodel -> qt/paymentserver
  Circular dependency: qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel
  Circular dependency: qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog
  Circular dependency: qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel
  Circular dependency: qt/walletmodel -> qt/walletmodeltransaction -> qt/walletmodel
  Circular dependency: rpc/rawtransaction -> wallet/rpcwallet -> rpc/rawtransaction
  Circular dependency: wallet/coincontrol -> wallet/wallet -> wallet/coincontrol
  Circular dependency: wallet/fees -> wallet/wallet -> wallet/fees
  Circular dependency: wallet/rpcwallet -> wallet/wallet -> wallet/rpcwallet
  Circular dependency: wallet/walletdb -> wallet/wallet -> wallet/walletdb
  Circular dependency: txmempool -> validation -> policy/rbf -> txmempool
  Circular dependency: txmempool -> validation -> validationinterface -> txmempool
  Circular dependency: qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/addressbookpage
  Circular dependency: qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/guiutil
  Circular dependency: qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage
  Circular dependency: qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/receivecoinsdialog -> qt/addressbookpage
  Circular dependency: qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/intro -> qt/guiutil
  Circular dependency: qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage
  ```

Tree-SHA512: 29bc985b7a41699f4666b0aaa785ca63c2145e84c37458536f4dcf8e3de8f1312cf0323fe09cb8f348a9d363583f76eac2d5bee574bc6a9f9cc97a9b0aad406f
@PastaPastaPasta
Merge bitcoin#12757: Clarify include guard naming convention
db747ea 
3bcc005 Add lint-include-guards.sh which checks include guard consistency (practicalswift)
8fd6af8 Fix missing or inconsistent include guards (practicalswift)
8af65d9 Document include guard convention (practicalswift)

Pull request description:

  * **Documentation**: Document include guard convention
  * **Fix**: Fix missing or inconsistent include guards
  * **Regression test**: Add `lint-include-guards.sh` which checks include guard consistency

Tree-SHA512: 8171878f60fd08ccbea943a11e835195750592abb9d7ab74eaa4265ae7fac523b1da9d31ca13d6ab73dd596e49986bfb7593c696e5f39567c93e610165bc2acc
Signed-off-by: pasta <pasta@dashboost.org>

# Conflicts:
#	src/bech32.h
#	src/consensus/merkle.h
#	src/key_io.h
#	src/policy/fees.h
#	src/rpc/server.h
#	src/script/bitcoinconsensus.h
#	src/wallet/coinselection.h
@PastaPastaPasta
fix compilation in headers that contain 'dashes' and adjust linter
a6cdb75 
Signed-off-by: pasta <pasta@dashboost.org>
@PastaPastaPasta PastaPastaPasta mentioned this pull request Jul 19, 2020
Merged
@PastaPastaPasta PastaPastaPasta requested a review from UdjinM6 July 19, 2020 07:14
UdjinM6
UdjinM6 requested changes Jul 19, 2020
View reviewed changes
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.

Pls see ecc27be. And maybe ee42c8a as an alternative to a6cdb75 (i.e. apply use an underscore to separate words naming convention to src as we did for tests in #3612)?

@UdjinM6 UdjinM6 added this to the 17 milestone Jul 19, 2020
@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented Jul 19, 2020

Pls see ecc27be. And maybe ee42c8a as an alternative to a6cdb75 (i.e. apply use an underscore to separate words naming convention to src as we did for tests in #3612)?

Cherry-picked ecc27be, I'm not sure I'm really a fan of ee42c8a, I originally made a commit like that. But I kindof like the dashes, so I dropped my commit and added that script change instead. Which makes the diff simpler anyhow

@UdjinM6
Copy link

UdjinM6 commented Jul 19, 2020

I originally made a commit like that

Heh, and I originally made a commit like a6cdb75 locally 😆 but then I thought that having consistent file naming rules might be a good thing.

@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented Jul 19, 2020

Hmm, it seems like we are at an impass 🤔

UdjinM6
UdjinM6 approved these changes Jul 19, 2020
View reviewed changes
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.

No, I mean either way is fine (for now). We can tweak this later :)

utACK

@UdjinM6 UdjinM6 merged commit 6e592cc into dashpay:develop Jul 20, 2020
@PastaPastaPasta PastaPastaPasta deleted the backports-0.17-pr16 branch July 20, 2020 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

17

Development

Successfully merging this pull request may close these issues.

3 participants

@PastaPastaPasta @UdjinM6 @sipa