Break circular dependency main ↔ txdb #7815

pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2016_04_break_txdb_main_dep changing 5 files +87 −89
  1. laanwj commented at 1:21 pm on April 5, 2016: member

    Builds on #7756 (only the last commit is specific here). Break the circular dependency between main and txdb by:

    • Moving CBlockFileInfo from main.h to chain.h. I think this makes sense, as the other block-file stuff is there too.
    • Moving CDiskTxPos from main.h to txdb.h. This type, used for -txindex seems specific to txdb.
    • Pass a functor insertBlockIndex to LoadBlockIndexGuts. This leaves it up to the caller how to insert block indices.
  2. laanwj added the label Refactoring on Apr 5, 2016
  3. dcousens commented at 0:24 am on April 6, 2016: contributor
    concept ACK, will wait on rebase for review
  4. laanwj force-pushed on Apr 6, 2016
  5. laanwj commented at 10:20 am on April 6, 2016: member
    Rebased
  6. jonasschnelli commented at 12:06 pm on April 7, 2016: contributor
    Concept ACK
  7. paveljanik commented at 5:26 pm on April 7, 2016: contributor
  8. Break circular dependency main ↔ txdb
    Break the circular dependency between main and txdb by:
    
    - Moving `CBlockFileInfo` from `main.h` to `chain.h`. I think this makes
      sense, as the other block-file stuff is there too.
    
    - Moving `CDiskTxPos` from `main.h` to `txdb.h`. This type seems
      specific to txdb.
    
    - Pass a functor `insertBlockIndex` to `LoadBlockIndexGuts`. This leaves
      it up to the caller how to insert block indices.
    99e70751f2
  9. laanwj force-pushed on Apr 15, 2016
  10. laanwj commented at 3:49 pm on April 15, 2016: member
    699ea05 rebased as 99e7075 (now that #7756 merged)
  11. in src/txdb.h: in 99e70751f2
    18-class CBlockFileInfo;
    19+#include <boost/function.hpp>
    20+
    21 class CBlockIndex;
    22-struct CDiskTxPos;
    23+class CCoinsViewDBCursor;
    


    paveljanik commented at 8:12 pm on April 22, 2016:
    +class CCoinsViewDBCursor; here and -class CCoinsViewDBCursor; later?

    laanwj commented at 11:34 am on April 25, 2016:
    yes I moved all pre-declarations to the top
  12. paveljanik commented at 8:13 pm on April 22, 2016: contributor

    utACK https://github.com/bitcoin/bitcoin/pull/7815/commits/99e70751f23aa59ac297f6746dd8f09a140d48ae

    Reviewing combined commits is a nightmare ;-)

    Testing now.

  13. dcousens commented at 3:27 am on April 26, 2016: contributor
    utACK 99e7075
  14. sipa commented at 5:07 pm on May 5, 2016: member
    utACK 99e70751f23aa59ac297f6746dd8f09a140d48ae
  15. laanwj merged this on May 6, 2016
  16. laanwj closed this on May 6, 2016

  17. laanwj referenced this in commit efee32f381 on May 6, 2016
  18. codablock referenced this in commit c461ee93cf on Sep 16, 2017
  19. codablock referenced this in commit e62d5cead7 on Sep 19, 2017
  20. codablock referenced this in commit 96832597c4 on Sep 27, 2017
  21. codablock referenced this in commit 718e5ad241 on Oct 12, 2017
  22. codablock referenced this in commit abaf524f0c on Oct 19, 2017
  23. UdjinM6 referenced this in commit 3e89f396a0 on Nov 8, 2017
  24. zkbot referenced this in commit 6dcc7dd6ce on Mar 9, 2018
  25. zkbot referenced this in commit b094b02c0b on Mar 10, 2018
  26. zkbot referenced this in commit 59ef0e4c9c on Mar 12, 2018
  27. zkbot referenced this in commit 6dfd4baa1a on Mar 12, 2018
  28. zkbot referenced this in commit 05132fdca8 on Apr 6, 2018
  29. zkbot referenced this in commit 5fefc451a7 on Apr 13, 2018
  30. zkbot referenced this in commit 4c91fbf1c7 on May 31, 2018
  31. zkbot referenced this in commit 82d64f57c9 on Oct 24, 2018
  32. zkbot referenced this in commit 971f37e510 on Oct 25, 2018
  33. zkbot referenced this in commit 5b8b057c96 on Apr 5, 2019
  34. zkbot referenced this in commit a53fd12544 on Apr 9, 2019
  35. zkbot referenced this in commit fcf551eaaf on May 24, 2019
  36. zkbot referenced this in commit e25cb39033 on May 24, 2019
  37. zkbot referenced this in commit 3d37ebe9d8 on May 28, 2019
  38. random-zebra referenced this in commit b909e96121 on Aug 12, 2020
  39. DrahtBot locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-12-23 03:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me