Trivial changes #6004

pull theuni wants to merge 21 commits into bitcoin:master from theuni:trivial-rebased changing 39 files +129 −116
  1. theuni commented at 10:56 PM on April 11, 2015: member

    It's been a while now, so here's what's piled up in trivial.

    Fwiw, since we dropped the policy on header include order, I'll start NACKing those changes in trivial from this point forward, unless they're necessary for some specific reason. With the current modularization effort that constantly touches includes, they just cause unnecessary merge conflicts.

    I'll also be more picky about arbitrary cosmetic changes, as they could ping/pong forever.

  2. [Qt] header group cleanup
    - seperate core from GUI headers where this was missing
    - remove an unneeded new-line
    f25a1356c2
  3. Remove folder and images for bootstrap.md 29b7f9bf9d
  4. Add x86_64* i686* mips* and arm* to depends .gitignore f4a0022a7e
  5. Fix docs for 'complete' field in 'signrawtransaction' response da145a9871
  6. Point to the Debian 7.8 installer
    Link to 7.7 is broken.
    3aae758d83
  7. Replaced current function names with __func__ in LogPrintf() calls. cbc4b40912
  8. Removed '()' where used without contents inside
    This additional patch removes '()' from current function name in LogPrintf output.
    7757c11a9c
  9. Fix typo in init.cpp interpration/interpretation 667a0d9014
  10. Use https link to bitcoin.org in Doxygen intro 1a84086978
  11. Update REST URL to match reality 362b07139c
  12. [Trivial] format sync.h ad9f76af4b
  13. Re-wrote a passage of text that was difficult to understand. 693a94c56a
  14. Remove leftover strlcpy.h copyright
    src/strlcpy.h was removed by https://github.com/bitcoin/bitcoin/commit/6032e4f4e7c1892a4e3f0a1a2007e4cd0fe99937
    a5d39123a9
  15. depends: latest config.guess and config.sub 35450f6c7c
  16. [Qt, Trivial] misc minor string changes
    - write "Bitcoins" uppercase
    - replace secure/insecure for payment requests with
      authenticated/unauthenticated
    - change a translatable string for payment request expiry to match another
      existing string to only get ONE resulting string to translate
    f3be4bf155
  17. [Qt, Trivial] fix header groupings + space, intdentation fixes 5562a724b0
  18. [Qt, Trivial] remove two unneeded includes of wallet/db.h 575bf1222d
  19. Make 'Default: %u' spacing consistent in help message
    Comment by pryds on Transifex.
    6706eccac4
  20. ensure consistent header comment naming conventions
    - BITCOIN_FOLDER_SUBFOLDER_FILENAME_H
    c2dc8511fe
  21. Add operator names to DNS Seed list f52ef14a41
  22. trivial string change in wallet.cpp (the -> that) eca4e0ad78
  23. in src/main.cpp:None in eca4e0ad78
    3478 | @@ -3479,7 +3479,7 @@ void static ProcessGetData(CNode* pfrom)
    3479 |                          send = mi->second->IsValid(BLOCK_VALID_SCRIPTS) && (pindexBestHeader != NULL) &&
    3480 |                              (mi->second->GetBlockTime() > pindexBestHeader->GetBlockTime() - 30 * 24 * 60 * 60);
    3481 |                          if (!send) {
    3482 | -                            LogPrintf("ProcessGetData(): ignoring request from peer=%i for old block that isn't in the main chain\n", pfrom->GetId());
    3483 | +                            LogPrintf("%s: ignoring request from peer=%i  for old block that isn't in the main chain\n", __func__, pfrom->GetId());
    


    paveljanik commented at 6:42 AM on April 12, 2015:

    one new space before "for old block".

  24. in src/chainparams.cpp:None in eca4e0ad78
     150 | @@ -151,11 +151,11 @@ class CMainParams : public CChainParams {
     151 |          assert(consensus.hashGenesisBlock == uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"));
     152 |          assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
     153 |  
     154 | -        vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be"));
     155 | -        vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me"));
     156 | -        vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org"));
     157 | -        vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com"));
     158 | -        vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org"));
     159 | +        vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be")); // Peiter Wiulle
    


    Diapolo commented at 12:19 PM on April 12, 2015:

    This seems to be not THE Pieter Wuille, we all know ;)?


    sipa commented at 12:20 PM on April 12, 2015:

    Who is that guy?!!?


    Diapolo commented at 2:45 PM on April 15, 2015:

    @theuni https://github.com/theuni/bitcoin/pull/17 You just need to rebase to current master I guess...

  25. in src/chainparams.cpp:None in eca4e0ad78
     157 | -        vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com"));
     158 | -        vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org"));
     159 | +        vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be")); // Peiter Wiulle
     160 | +        vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me")); // Matt Corallo
     161 | +        vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr
     162 | +        vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Addy Yeow
    


    ayeowch commented at 12:29 PM on April 12, 2015:

    Christian Decker operates seed.bitcoinstats.com

  26. jgarzik commented at 3:25 PM on April 12, 2015: contributor

    ACK

  27. laanwj commented at 8:15 AM on April 13, 2015: member

    I'll also be more picky about arbitrary cosmetic changes, as they could ping/pong forever

    Fwiw, since we dropped the policy on header include order, I'll start NACKing those changes in trivial

    Indeed.

  28. laanwj commented at 8:36 AM on April 13, 2015: member

    ACK, apart from @sipa's name

  29. paveljanik commented at 2:41 PM on April 13, 2015: contributor

    ACK (nits: @sipa's name, one additional space)

  30. laanwj referenced this in commit 6a0bcb80e4 on Apr 20, 2015
  31. laanwj commented at 11:39 AM on April 20, 2015: member

    Merged via 6a0bcb80e4ce380a39f81b4fb01150d5b7e6cdf7, after fixing nits.

  32. laanwj closed this on Apr 20, 2015

  33. ayeowch commented at 11:53 AM on April 20, 2015: contributor

    @laanwj Looks like one nit is missing in the merged commit: seed.bitcoinstats.com is operated by Christian Decker. https://github.com/bitcoin/bitcoin/commit/6a0bcb80e4ce380a39f81b4fb01150d5b7e6cdf7

  34. 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: 2026-04-13 21:15 UTC

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