Page MenuHomePhabricator
Differential D10506

refactor: enable -netinfo to add future networks (i2p, cjdns)
ClosedPublic
Actions

Authored by PiRK on Nov 23 2021, 14:35.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC46866bc04b01: refactor: enable -netinfo to add future networks (i2p, cjdns)
Summary

After this commit, a new network may be added by changing 4 lines:

  • increment the value of m_networks_size
  • add the network name to m_networks
  • add the network name to this line: result += " ipv4 ipv6 onion total block-relay\n";
  • add "counts.at(i).at(<m_networks pos>)" to this line: result += strprintf("%-5s %5i %5i %5i %5i %5i\n...

This is a backport of core#20002 [5/5]
https://github.com/bitcoin/bitcoin/pull/20002/commits/6272604bef3b409455b010d134b4b62c8f6ff49f

Depends on D10505

Test Plan

ninja all check-all

Diff Detail

Event Timeline

PiRK created this revision.Nov 23 2021, 14:35
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 23 2021, 14:35
PiRK requested review of this revision.Nov 23 2021, 14:35
teamcity edited the summary of this revision. (Show Details)Nov 23 2021, 14:36
Harbormaster completed remote builds in B17313: Diff 30950.Nov 23 2021, 15:02
teamcity added a comment.Nov 23 2021, 15:02
Build Bitcoin ABC Diffs / Diff Testing (build-clang-tidy) failed.

Tail of the build log:

[450/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/networkstyle.cpp.o
[451/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bantablemodel.cpp.o
[452/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/modaloverlay.cpp.o
[453/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/clientmodel.cpp.o
[454/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/platformstyle.cpp.o
[455/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoin-qt-base_autogen/mocs_compilation.cpp.o
[456/508] Building CXX object src/bench/CMakeFiles/bitcoin-bench.dir/mempool_stress.cpp.o
[457/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoingui.cpp.o
[458/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qvalidatedlineedit.cpp.o
[459/508] Linking CXX executable src/bench/bitcoin-bench
[460/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/guiutil.cpp.o
[461/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoin.cpp.o
[462/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qvaluecombobox.cpp.o
[463/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qrc_bitcoin.cpp.o
[464/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/intro.cpp.o
[465/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/optionsdialog.cpp.o
[466/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/notificator.cpp.o
[467/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/peertablemodel.cpp.o
[468/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/optionsmodel.cpp.o
[469/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/coincontroltreewidget.cpp.o
[470/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/utilitydialog.cpp.o
[471/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/addressbookpage.cpp.o
[472/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/createwalletdialog.cpp.o
[473/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/editaddressdialog.cpp.o
[474/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/trafficgraphwidget.cpp.o
[475/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/askpassphrasedialog.cpp.o
[476/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/openuridialog.cpp.o
[477/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qrimagewidget.cpp.o
[478/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/addresstablemodel.cpp.o
[479/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/rpcconsole.cpp.o
[480/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/overviewpage.cpp.o
[481/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/coincontroldialog.cpp.o
[482/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionfilterproxy.cpp.o
[483/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/receiverequestdialog.cpp.o
[484/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiondescdialog.cpp.o
[485/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/recentrequeststablemodel.cpp.o
[486/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/sendcoinsentry.cpp.o
[487/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionrecord.cpp.o
[488/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/paymentserver.cpp.o
[489/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiondesc.cpp.o
[490/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/receivecoinsdialog.cpp.o
[491/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/signverifymessagedialog.cpp.o
[492/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qrc_bitcoin_locale.cpp.o
[493/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/sendcoinsdialog.cpp.o
[494/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiontablemodel.cpp.o
[495/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletframe.cpp.o
[496/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionview.cpp.o
[497/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/splashscreen.cpp.o
[498/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o
[499/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/paymentrequestplus.cpp.o
[500/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletmodel.cpp.o
[501/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletmodeltransaction.cpp.o
[502/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletview.cpp.o
[503/508] Linking CXX static library src/qt/libbitcoin-qt-base.a
[504/508] Automatic MOC for target bitcoin-qt
[505/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt.dir/bitcoin-qt_autogen/mocs_compilation.cpp.o
[506/508] Building CXX object src/qt/CMakeFiles/bitcoin-qt.dir/main.cpp.o
[507/508] Linking CXX executable src/qt/bitcoin-qt
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang-tidy failed with exit code 1
Fabien requested changes to this revision.Nov 23 2021, 15:16
Fabien added a subscriber: Fabien.

clang-tidy failed, back on your queue

This revision now requires changes to proceed.Nov 23 2021, 15:16
PiRK updated this revision to Diff 30951.Nov 23 2021, 16:10

add missing braces (fix clang-tidy)

Harbormaster completed remote builds in B17314: Diff 30951.Nov 23 2021, 16:24
Fabien accepted this revision.Nov 24 2021, 08:37
This revision is now accepted and ready to land.Nov 24 2021, 08:37
Closed by commit rABC46866bc04b01: refactor: enable -netinfo to add future networks (i2p, cjdns) (authored by Jon Atack <jon@atack.com>, committed by PiRK). · Explain WhyNov 24 2021, 08:51
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABC46866bc04b01: refactor: enable -netinfo to add future networks (i2p, cjdns).

Revision Contents
Changeset List

PathSize
src/
82 lines

Diff 30950

View Options

src/bitcoin-cli.cpp

Loading...