diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index c382d08a83..46fc162902 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -30,7 +30,7 @@ jobs: - name: MacOS Install Deps if: contains(matrix.os, 'macos') run: | - brew install ccache boost pkgconf libevent qt@6 qrencode coreutils llvm + brew install ccache boost pkgconf qt@6 qrencode coreutils llvm if [ "${BUILD_APP_TESTS}" = "ON" ]; then brew install googletest fi @@ -45,7 +45,7 @@ jobs: run: | sudo apt-get update && sudo apt-get install -y \ build-essential ccache cmake pkgconf \ - libevent-dev libboost-dev libsqlite3-dev libgl-dev libqrencode-dev \ + libboost-dev libsqlite3-dev libgl-dev libqrencode-dev \ qt6-base-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools \ qt6-declarative-dev qml6-module-qt-labs-settings qml6-module-qtquick qml6-module-qtquick-controls qml6-module-qtquick-dialogs qml6-module-qtquick-layouts qml6-module-qtquick-templates qml6-module-qtqml if [ "${BUILD_APP_TESTS}" = "ON" ]; then diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cae7cc99c2..db669110d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,6 @@ jobs: cmake \ ninja-build \ pkg-config \ - libevent-dev \ libsqlite3-dev \ zlib1g-dev \ libboost-all-dev \ diff --git a/.github/workflows/gui-functional-tests.yml b/.github/workflows/gui-functional-tests.yml index 8eeea90b35..427937133a 100644 --- a/.github/workflows/gui-functional-tests.yml +++ b/.github/workflows/gui-functional-tests.yml @@ -32,7 +32,7 @@ jobs: sudo apt-get install -y \ build-essential cmake curl pkgconf python3 \ xvfb xauth \ - libevent-dev libboost-dev libsqlite3-dev libgl-dev libqrencode-dev \ + libboost-dev libsqlite3-dev libgl-dev libqrencode-dev \ qt6-qpa-plugins \ qt6-base-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools \ qt6-declarative-dev \ diff --git a/test/functional/qml_test_debug_log.py b/test/functional/qml_test_debug_log.py index 3995666a39..ec22acf432 100644 --- a/test/functional/qml_test_debug_log.py +++ b/test/functional/qml_test_debug_log.py @@ -58,7 +58,6 @@ def start(self): "-disablewallet", "-logtimemicros", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", "-nolisten", ] diff --git a/test/functional/qml_test_harness.py b/test/functional/qml_test_harness.py index d0f8d256e7..a33b541df3 100755 --- a/test/functional/qml_test_harness.py +++ b/test/functional/qml_test_harness.py @@ -201,7 +201,6 @@ def start(self): ) + [ "-logtimemicros", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", ] + self.extra_args if self.no_listen_arg: diff --git a/test/functional/qml_test_peers.py b/test/functional/qml_test_peers.py index 11439fb43d..c20c864ff3 100644 --- a/test/functional/qml_test_peers.py +++ b/test/functional/qml_test_peers.py @@ -188,7 +188,6 @@ def start(self): "-qml_onboarded=1", "-logtimemicros", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", ] print(f"Starting GUI node: {' '.join(gui_args)}") @@ -367,7 +366,6 @@ def restart_gui(self): "-qml_onboarded=1", "-logtimemicros", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", ] print(f" Restarting GUI: {' '.join(gui_args)}") diff --git a/test/functional/qml_test_receive.py b/test/functional/qml_test_receive.py index 2e7a500600..a0e728d30a 100644 --- a/test/functional/qml_test_receive.py +++ b/test/functional/qml_test_receive.py @@ -73,7 +73,6 @@ def _relaunch_gui(harness): "-qml_onboarded=1", "-logtimemicros", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", "-nolisten", ] diff --git a/test/functional/qml_test_shutdown.py b/test/functional/qml_test_shutdown.py index b74d74d338..2850d01a24 100755 --- a/test/functional/qml_test_shutdown.py +++ b/test/functional/qml_test_shutdown.py @@ -119,7 +119,6 @@ def start_gui_without_driver(harness): "-qml_onboarded=1", "-logtimemicros", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", "-nolisten", ] diff --git a/test/functional/qml_test_tray.py b/test/functional/qml_test_tray.py index f2d64c19dc..0eb5c725df 100644 --- a/test/functional/qml_test_tray.py +++ b/test/functional/qml_test_tray.py @@ -78,7 +78,6 @@ def run_tests(): "-qml_onboarded=1", "-logtimemicros", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", "-nolisten", ] diff --git a/test/functional/qml_test_wallet_qt_compat.py b/test/functional/qml_test_wallet_qt_compat.py index ee96421f22..cce7d39bba 100644 --- a/test/functional/qml_test_wallet_qt_compat.py +++ b/test/functional/qml_test_wallet_qt_compat.py @@ -131,7 +131,6 @@ def launch_bitcoin_qt(bitcoin_qt, harness): "-nosplash", "-min", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", "-printtoconsole=1", ] diff --git a/test/functional/qml_wallet_test_lib.py b/test/functional/qml_wallet_test_lib.py index f9e8b2de2b..3df2c2008f 100644 --- a/test/functional/qml_wallet_test_lib.py +++ b/test/functional/qml_wallet_test_lib.py @@ -228,7 +228,6 @@ def start_gui(self, reset_gui_settings=False, start_onboarded=True, extra_args=N ) + [ "-logtimemicros", "-debug", - "-debugexclude=libevent", "-debugexclude=leveldb", "-nolisten", ]