Page MenuHomePhabricator

[backport#15195] gui: Add closeWallet to WalletController
ClosedPublic

Authored by majcosta on May 20 2020, 17:29.

Event Timeline

majcosta created this revision.May 20 2020, 17:29
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 20 2020, 17:29
majcosta requested review of this revision.May 20 2020, 17:29
teamcity edited the summary of this revision. (Show Details)May 20 2020, 17:30

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

deadalnix requested changes to this revision.May 20 2020, 17:34
deadalnix added a subscriber: deadalnix.
deadalnix added inline comments.
src/qt/walletcontroller.cpp
78

braces

This revision now requires changes to proceed.May 20 2020, 17:34
majcosta edited the summary of this revision. (Show Details)May 20 2020, 17:35
majcosta updated this revision to Diff 20366.May 20 2020, 17:52

added missing braces

Snippet of first build failure:

[17:54:07] :	 [Step 1/2] [407/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/platformstyle.cpp.o
[17:54:07] :	 [Step 1/2] [408/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qvalidatedlineedit.cpp.o
[17:54:07] :	 [Step 1/2] [409/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/clientmodel.cpp.o
[17:54:07] :	 [Step 1/2] [410/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/guiutil.cpp.o
[17:54:07] :	 [Step 1/2] [411/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qvaluecombobox.cpp.o
[17:54:07] :	 [Step 1/2] [412/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/optionsmodel.cpp.o
[17:54:07] :	 [Step 1/2] [413/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/optionsdialog.cpp.o
[17:54:07] :	 [Step 1/2] [414/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/peertablemodel.cpp.o
[17:54:07] :	 [Step 1/2] [415/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/trafficgraphwidget.cpp.o
[17:54:07] :	 [Step 1/2] [416/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/splashscreen.cpp.o
[17:54:07] :	 [Step 1/2] [417/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/rpcconsole.cpp.o
[17:54:07] :	 [Step 1/2] [418/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/addressbookpage.cpp.o
[17:54:07] :	 [Step 1/2] [419/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/utilitydialog.cpp.o
[17:54:07] :	 [Step 1/2] [420/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/coincontroltreewidget.cpp.o
[17:54:07] :	 [Step 1/2] [421/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/askpassphrasedialog.cpp.o
[17:54:07] :	 [Step 1/2] [422/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/addresstablemodel.cpp.o
[17:54:07] :	 [Step 1/2] [423/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/editaddressdialog.cpp.o
[17:54:07] :	 [Step 1/2] [424/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/coincontroldialog.cpp.o
[17:54:07] :	 [Step 1/2] [425/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/overviewpage.cpp.o
[17:54:07] :	 [Step 1/2] [426/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/openuridialog.cpp.o
[17:54:07] :	 [Step 1/2] [427/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/receiverequestdialog.cpp.o
[17:54:07] :	 [Step 1/2] [428/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/receivecoinsdialog.cpp.o
[17:54:07] :	 [Step 1/2] [429/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/paymentserver.cpp.o
[17:54:07] :	 [Step 1/2] [430/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/recentrequeststablemodel.cpp.o
[17:54:07] :	 [Step 1/2] [431/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiondescdialog.cpp.o
[17:54:07] :	 [Step 1/2] [432/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionfilterproxy.cpp.o
[17:54:07] :	 [Step 1/2] [433/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/sendcoinsdialog.cpp.o
[17:54:07] :	 [Step 1/2] [434/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/sendcoinsentry.cpp.o
[17:54:07] :	 [Step 1/2] [435/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionrecord.cpp.o
[17:54:07] :	 [Step 1/2] [436/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/signverifymessagedialog.cpp.o
[17:54:07] :	 [Step 1/2] [437/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiondesc.cpp.o
[17:54:07] :	 [Step 1/2] [438/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiontablemodel.cpp.o
[17:54:07] :	 [Step 1/2] [439/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionview.cpp.o
[17:54:07] :	 [Step 1/2] [440/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletframe.cpp.o
[17:54:07] :	 [Step 1/2] [441/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/paymentrequestplus.cpp.o
[17:54:07] :	 [Step 1/2] [442/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletmodeltransaction.cpp.o
[17:54:07] :	 [Step 1/2] [443/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletmodel.cpp.o
[17:54:07] :	 [Step 1/2] [444/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletview.cpp.o
[17:54:08] :	 [Step 1/2] [445/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qrc_bitcoin.cpp.o
[17:54:10] :	 [Step 1/2] [446/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o
[17:54:10] :	 [Step 1/2] FAILED: src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o 
[17:54:10] :	 [Step 1/2] /usr/bin/ccache /usr/bin/clang++  -DBOOST_AC_USE_STD_ATOMIC -DBOOST_SP_USE_STD_ATOMIC -DBUILD_BITCOIN_INTERNAL -DENABLE_AVX2 -DENABLE_SHANI -DENABLE_SSE41 -DHAVE_BUILD_INFO -DHAVE_CONFIG_H -DHAVE_CONSENSUS_LIB -DLEVELDB_ATOMIC_PRESENT -DLEVELDB_PLATFORM_POSIX -DOS_LINUX -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_WIDGETS_LIB -Isrc/qt/bitcoin-qt-base_autogen/include -I../src/. -Isrc -I../src/univalue/include -Isrc/crypto/.. -I../src/secp256k1/include -I../src/leveldb/include -isystem /usr/include/miniupnpc -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -isystem /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -isystem /usr/include/x86_64-linux-gnu/qt5/QtNetwork -isystem /usr/include/x86_64-linux-gnu/qt5/QtDBus -g -O2 -fPIC -fvisibility=hidden   -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wvla -Wformat-security -Wcast-align -Wunused-parameter -Wmissing-braces -Wthread-safety-analysis -Wshadow -Wrange-loop-analysis -Wredundant-decls -Wredundant-move -Wno-unused-parameter -Wno-implicit-fallthrough -Werror=return-type -Werror=switch -Werror=thread-safety-analysis -Werror=vla -pthread -fPIC -std=gnu++14 -MD -MT src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o -MF src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o.d -o src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o -c ../src/qt/walletcontroller.cpp
[17:54:10] :	 [Step 1/2] ../src/qt/walletcontroller.cpp:80:5: error: expected expression
[17:54:10] :	 [Step 1/2]     };
[17:54:10] :	 [Step 1/2]     ^
[17:54:10] :	 [Step 1/2] 1 error generated.
[17:54:12] :	 [Step 1/2] [447/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoin.cpp.o
[17:54:12] :	 [Step 1/2] [448/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoin-qt-base_autogen/mocs_compilation.cpp.o
[17:54:12] :	 [Step 1/2] [449/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoingui.cpp.o
[17:54:12] :	 [Step 1/2] [450/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qrc_bitcoin_locale.cpp.o
[17:54:12] :	 [Step 1/2] ninja: build stopped: subcommand failed.
[17:54:12]W:	 [Step 1/2] ++ print_sanitizers_log
[17:54:12]W:	 [Step 1/2] ++ for log in "${SAN_LOG_DIR}"/*.log.*
[17:54:12]W:	 [Step 1/2] ++ echo '*** Output of /tmp/sanitizer_logs/*.log.* ***'
[17:54:12]W:	 [Step 1/2] ++ cat '/tmp/sanitizer_logs/*.log.*'
[17:54:12] :	 [Step 1/2] *** Output of /tmp/sanitizer_logs/*.log.* ***
[17:54:12]W:	 [Step 1/2] cat: '/tmp/sanitizer_logs/*.log.*': No such file or directory
[17:54:13]W:	 [Step 1/2] cp: cannot stat '/work/ibd/debug.log': No such file or directory
[17:54:18]W:	 [Step 1/2] Process exited with code 1
[17:54:18]E:	 [Step 1/2] Process exited with code 1 (Step: Command Line)

Snippet of first build failure:

[17:54:26] :	 [Step 1/2] [414/455] Linking CXX executable src/bench/bitcoin-bench
[17:54:26] :	 [Step 1/2] [415/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/guiutil.cpp.o
[17:54:26] :	 [Step 1/2] [416/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/clientmodel.cpp.o
[17:54:27] :	 [Step 1/2] [417/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/addressbookpage.cpp.o
[17:54:27] :	 [Step 1/2] [418/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/editaddressdialog.cpp.o
[17:54:28] :	 [Step 1/2] [419/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/coincontroltreewidget.cpp.o
[17:54:32] :	 [Step 1/2] [420/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/askpassphrasedialog.cpp.o
[17:54:32] :	 [Step 1/2] [421/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/openuridialog.cpp.o
[17:54:33] :	 [Step 1/2] [422/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/utilitydialog.cpp.o
[17:54:33] :	 [Step 1/2] [423/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/splashscreen.cpp.o
[17:54:34] :	 [Step 1/2] [424/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/qrc_bitcoin_locale.cpp.o
[17:54:35] :	 [Step 1/2] [425/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/overviewpage.cpp.o
[17:54:35] :	 [Step 1/2] [426/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/receiverequestdialog.cpp.o
[17:54:35] :	 [Step 1/2] [427/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoingui.cpp.o
[17:54:36] :	 [Step 1/2] [428/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionfilterproxy.cpp.o
[17:54:36] :	 [Step 1/2] [429/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoin.cpp.o
[17:54:37] :	 [Step 1/2] [430/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiondescdialog.cpp.o
[17:54:37] :	 [Step 1/2] [431/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/addresstablemodel.cpp.o
[17:54:38] :	 [Step 1/2] [432/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/receivecoinsdialog.cpp.o
[17:54:39] :	 [Step 1/2] [433/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/coincontroldialog.cpp.o
[17:54:39] :	 [Step 1/2] [434/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/paymentserver.cpp.o
[17:54:40] :	 [Step 1/2] [435/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/sendcoinsentry.cpp.o
[17:54:40] :	 [Step 1/2] [436/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/rpcconsole.cpp.o
[17:54:41] :	 [Step 1/2] [437/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/recentrequeststablemodel.cpp.o
[17:54:41] :	 [Step 1/2] [438/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionrecord.cpp.o
[17:54:42] :	 [Step 1/2] [439/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletframe.cpp.o
[17:54:43] :	 [Step 1/2] [440/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o
[17:54:43] :	 [Step 1/2] FAILED: src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o 
[17:54:43] :	 [Step 1/2] /usr/bin/ccache /usr/bin/c++  -DBOOST_AC_USE_STD_ATOMIC -DBOOST_SP_USE_STD_ATOMIC -DBUILD_BITCOIN_INTERNAL -DENABLE_AVX2 -DENABLE_SHANI -DENABLE_SSE41 -DHAVE_BUILD_INFO -DHAVE_CONFIG_H -DHAVE_CONSENSUS_LIB -DLEVELDB_ATOMIC_PRESENT -DLEVELDB_PLATFORM_POSIX -DOS_LINUX -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_WIDGETS_LIB -Isrc/qt/bitcoin-qt-base_autogen/include -I../src/. -Isrc -I../src/univalue/include -Isrc/crypto/.. -I../src/secp256k1/include -I../src/leveldb/include -isystem /usr/include/miniupnpc -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -isystem /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -isystem /usr/include/x86_64-linux-gnu/qt5/QtNetwork -isystem /usr/include/x86_64-linux-gnu/qt5/QtDBus -g -O2 -fPIC -fvisibility=hidden   -fstack-reuse=none -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wvla -Wformat-security -Wcast-align -Wunused-parameter -Wmissing-braces -Wshadow -Wredundant-decls -Wno-unused-parameter -Wno-implicit-fallthrough -pthread -fPIC -std=gnu++14 -MD -MT src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o -MF src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o.d -o src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.o -c ../src/qt/walletcontroller.cpp
[17:54:43] :	 [Step 1/2] ../src/qt/walletcontroller.cpp: In member function 'void WalletController::closeWallet(WalletModel*, QWidget*)':
[17:54:43] :	 [Step 1/2] ../src/qt/walletcontroller.cpp:80:5: error: expected primary-expression before '}' token
[17:54:43] :	 [Step 1/2]      };
[17:54:43] :	 [Step 1/2]      ^
[17:54:43] :	 [Step 1/2] ../src/qt/walletcontroller.cpp:80:5: error: return-statement with a value, in function returning 'void' [-fpermissive]
[17:54:43] :	 [Step 1/2] ../src/qt/walletcontroller.cpp:79:15: error: expected ';' before '}' token
[17:54:43] :	 [Step 1/2]          return
[17:54:43] :	 [Step 1/2]                ^
[17:54:43] :	 [Step 1/2]                ;
[17:54:43] :	 [Step 1/2]      };
[17:54:43] :	 [Step 1/2]      ~          
[17:54:43] :	 [Step 1/2] [441/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionview.cpp.o
[17:54:44] :	 [Step 1/2] [442/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/signverifymessagedialog.cpp.o
[17:54:44] :	 [Step 1/2] [443/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletmodeltransaction.cpp.o
[17:54:45] :	 [Step 1/2] [444/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiontablemodel.cpp.o
[17:54:45] :	 [Step 1/2] [445/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/paymentrequestplus.cpp.o
[17:54:45] :	 [Step 1/2] [446/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/sendcoinsdialog.cpp.o
[17:54:45] :	 [Step 1/2] [447/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiondesc.cpp.o
[17:54:46] :	 [Step 1/2] [448/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletview.cpp.o
[17:54:47] :	 [Step 1/2] [449/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletmodel.cpp.o
[17:54:47] :	 [Step 1/2] [450/455] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/bitcoin-qt-base_autogen/mocs_compilation.cpp.o
[17:54:47] :	 [Step 1/2] ninja: build stopped: subcommand failed.
[17:54:47]W:	 [Step 1/2] ++ print_sanitizers_log
[17:54:47]W:	 [Step 1/2] ++ for log in "${SAN_LOG_DIR}"/*.log.*
[17:54:47]W:	 [Step 1/2] ++ echo '*** Output of /tmp/sanitizer_logs/*.log.* ***'
[17:54:47]W:	 [Step 1/2] ++ cat '/tmp/sanitizer_logs/*.log.*'
[17:54:47] :	 [Step 1/2] *** Output of /tmp/sanitizer_logs/*.log.* ***
[17:54:48]W:	 [Step 1/2] cat: '/tmp/sanitizer_logs/*.log.*': No such file or directory
[17:54:49]W:	 [Step 1/2] cp: cannot stat '/work/ibd/debug.log': No such file or directory
[17:54:54]W:	 [Step 1/2] Process exited with code 1
[17:54:54]E:	 [Step 1/2] Process exited with code 1 (Step: Command Line)
majcosta planned changes to this revision.May 20 2020, 17:58
majcosta updated this revision to Diff 20368.May 20 2020, 18:02

fix misplaced semicolon after if statement instead of return

deadalnix requested changes to this revision.May 21 2020, 00:09

Test plan is not adequate.

This revision now requires changes to proceed.May 21 2020, 00:09
deadalnix accepted this revision.May 21 2020, 00:16
This revision is now accepted and ready to land.May 21 2020, 00:16