util: remove libevent <= 2.0.18 back-compat code #22914

fanquake commented at 7:35 AM on September 8, 2021: member

Now that we require libevent >=2.0.21, remove backwards compatibility code for older versions.

MarcoFalke added the label DrahtBot Guix build requested on Sep 8, 2021

practicalswift commented at 7:55 AM on September 8, 2021: contributor

Concept ACK

hebasto approved

hebasto commented at 8:50 AM on September 8, 2021: member

ACK 58857560fcd299ae4aa03250298acfe63b26c305, I've verified that there are no other places in the code with unneeded libevent back-compat code.

fanquake commented at 12:06 AM on September 9, 2021: member

Guix builds:

670bc438033084003d015f23ed58cc92d065c0c962d9cc753104d32b250e0a1d  guix-build-58857560fcd2/output/aarch64-linux-gnu/SHA256SUMS.part
f27f69c7e77538aa01713f202d4db89f413c55204cd1fc99ed31f2081d564116  guix-build-58857560fcd2/output/aarch64-linux-gnu/bitcoin-58857560fcd2-aarch64-linux-gnu-debug.tar.gz
390c3166f4fa47b15a4dcbfa5205d69458fb8a1c1862de956f850d047782d816  guix-build-58857560fcd2/output/aarch64-linux-gnu/bitcoin-58857560fcd2-aarch64-linux-gnu.tar.gz
d6c12f3a1b22a4cea299f660c59a50c51061594d19ef0e087583dbece913cd69  guix-build-58857560fcd2/output/arm-linux-gnueabihf/SHA256SUMS.part
c04dc4071b2295f74b2381850a361550e481a99851bc435a184f52cd85cd5ed0  guix-build-58857560fcd2/output/arm-linux-gnueabihf/bitcoin-58857560fcd2-arm-linux-gnueabihf-debug.tar.gz
56ebdfb44035d6dd4d90d5445386deefd2d27d65d1bd2c75b69317f6e951b18a  guix-build-58857560fcd2/output/arm-linux-gnueabihf/bitcoin-58857560fcd2-arm-linux-gnueabihf.tar.gz
facf87168d70a7ace1d1b368ce2bb58e1390d1ea78e6850a2bef5e31d55b3c7d  guix-build-58857560fcd2/output/dist-archive/bitcoin-58857560fcd2.tar.gz
895f1d8006935500fd2fdcc9bb994270059b881cad37ebd0654bfa5800fed113  guix-build-58857560fcd2/output/powerpc64-linux-gnu/SHA256SUMS.part
b1a422795ac9f8f16b3e52c23861f617e49ef74fdc2c6ebaef6af906f04fff81  guix-build-58857560fcd2/output/powerpc64-linux-gnu/bitcoin-58857560fcd2-powerpc64-linux-gnu-debug.tar.gz
8b42e3a20dba091011bee1cb72e9f494f88ea781c94124e1f70fd2c22797cbb8  guix-build-58857560fcd2/output/powerpc64-linux-gnu/bitcoin-58857560fcd2-powerpc64-linux-gnu.tar.gz
6d67c99cc4beccc8ea48e579b8b4f75dc47a91597e335074d806535c8def958b  guix-build-58857560fcd2/output/powerpc64le-linux-gnu/SHA256SUMS.part
f366d52438137962322a4883c1883666e97169488f0b9ddc21ce067e3944396c  guix-build-58857560fcd2/output/powerpc64le-linux-gnu/bitcoin-58857560fcd2-powerpc64le-linux-gnu-debug.tar.gz
7cf04fa623e217bcccbb42220487f298009d460dd5cb471a8f3bae22ef3e9802  guix-build-58857560fcd2/output/powerpc64le-linux-gnu/bitcoin-58857560fcd2-powerpc64le-linux-gnu.tar.gz
3a9a8990aeb0c56a7b584d1823886c73990645770659a63c45e4b85d1c3f8d65  guix-build-58857560fcd2/output/riscv64-linux-gnu/SHA256SUMS.part
5f8f663779b3f7196da9f1c9b40be7b2a8e2b33fdb6baf673520c0b07b23ce26  guix-build-58857560fcd2/output/riscv64-linux-gnu/bitcoin-58857560fcd2-riscv64-linux-gnu-debug.tar.gz
3f43cf17a71e05506822fdbacfd8b7f3af9c739fd131842014dd80c92062d566  guix-build-58857560fcd2/output/riscv64-linux-gnu/bitcoin-58857560fcd2-riscv64-linux-gnu.tar.gz
3f89ecc812a1cd0d6009a119957b9bc5831f37249153b5fafe3268e4dd3bb59c  guix-build-58857560fcd2/output/x86_64-apple-darwin18/SHA256SUMS.part
a828f7a623d38d549992af3035254ddde5a26e62638fe23a9bd76d2867683ce4  guix-build-58857560fcd2/output/x86_64-apple-darwin18/bitcoin-58857560fcd2-osx-unsigned.dmg
d24624964b6b68bfb03c88f49a22170f6fb0c16f4974949cde830be9b780b7f9  guix-build-58857560fcd2/output/x86_64-apple-darwin18/bitcoin-58857560fcd2-osx-unsigned.tar.gz
7e4f0ca9b199a33acdabdfb7d6d6ae6524f1d5f3bb924951d55b792e3ad19dad  guix-build-58857560fcd2/output/x86_64-apple-darwin18/bitcoin-58857560fcd2-osx64.tar.gz
bb466bd2a42c2914bf70b3b27335123eccad39b569d334c6f69ff08459c8ee6b  guix-build-58857560fcd2/output/x86_64-linux-gnu/SHA256SUMS.part
430bc8eb7506c1041db17b2393927f82be44921c00f4a698477ab3a7cdd31313  guix-build-58857560fcd2/output/x86_64-linux-gnu/bitcoin-58857560fcd2-x86_64-linux-gnu-debug.tar.gz
ab04cde29a2febcad6f50f288f6bbf026fc1a2c3309cd8f6276548d79c1d422e  guix-build-58857560fcd2/output/x86_64-linux-gnu/bitcoin-58857560fcd2-x86_64-linux-gnu.tar.gz
014a940eadbcba286cac1f2df5e6d6ea1d21a3623d98d8b1300ea44ac0e9efc5  guix-build-58857560fcd2/output/x86_64-w64-mingw32/SHA256SUMS.part
99a38df35244d34ae8d247953e6f5903713d6098e66a5a41d509074dc216b926  guix-build-58857560fcd2/output/x86_64-w64-mingw32/bitcoin-58857560fcd2-win-unsigned.tar.gz
a981dcde57666283d6b3bb9b0bbe2b1e54cb2b25b7301f3ecd3c5819acfd9823  guix-build-58857560fcd2/output/x86_64-w64-mingw32/bitcoin-58857560fcd2-win64-debug.zip
862d38ba5b4120fb55f9b4a664379c1e2ccc2940bc54e46bb8884e9f77245e81  guix-build-58857560fcd2/output/x86_64-w64-mingw32/bitcoin-58857560fcd2-win64-setup-unsigned.exe
539046ae22daf063c96fefe88359b9d3a85ea5f37fd27c56abd5bcb98490e290  guix-build-58857560fcd2/output/x86_64-w64-mingw32/bitcoin-58857560fcd2-win64.zip

in src/bitcoin-cli.cpp:28 in 58857560fc outdated

  24 | @@ -25,6 +25,7 @@
  25 |  #include <functional>
  26 |  #include <memory>
  27 |  #include <optional>
  28 | +#include <stdexcept>

kristapsk commented at 12:46 AM on September 9, 2021:

Why this additional include? It isn't related to the removal of libevent compatibility code. If because of std::runtime_error use below, should be a separate commit.

fanquake commented at 1:38 PM on September 9, 2021:

Removed.

fanquake deleted a comment on Sep 9, 2021

hebasto commented at 6:54 AM on September 9, 2021: member

Guix builds:

$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
670bc438033084003d015f23ed58cc92d065c0c962d9cc753104d32b250e0a1d  guix-build-58857560fcd2/output/aarch64-linux-gnu/SHA256SUMS.part
f27f69c7e77538aa01713f202d4db89f413c55204cd1fc99ed31f2081d564116  guix-build-58857560fcd2/output/aarch64-linux-gnu/bitcoin-58857560fcd2-aarch64-linux-gnu-debug.tar.gz
390c3166f4fa47b15a4dcbfa5205d69458fb8a1c1862de956f850d047782d816  guix-build-58857560fcd2/output/aarch64-linux-gnu/bitcoin-58857560fcd2-aarch64-linux-gnu.tar.gz
d6c12f3a1b22a4cea299f660c59a50c51061594d19ef0e087583dbece913cd69  guix-build-58857560fcd2/output/arm-linux-gnueabihf/SHA256SUMS.part
c04dc4071b2295f74b2381850a361550e481a99851bc435a184f52cd85cd5ed0  guix-build-58857560fcd2/output/arm-linux-gnueabihf/bitcoin-58857560fcd2-arm-linux-gnueabihf-debug.tar.gz
56ebdfb44035d6dd4d90d5445386deefd2d27d65d1bd2c75b69317f6e951b18a  guix-build-58857560fcd2/output/arm-linux-gnueabihf/bitcoin-58857560fcd2-arm-linux-gnueabihf.tar.gz
facf87168d70a7ace1d1b368ce2bb58e1390d1ea78e6850a2bef5e31d55b3c7d  guix-build-58857560fcd2/output/dist-archive/bitcoin-58857560fcd2.tar.gz
895f1d8006935500fd2fdcc9bb994270059b881cad37ebd0654bfa5800fed113  guix-build-58857560fcd2/output/powerpc64-linux-gnu/SHA256SUMS.part
b1a422795ac9f8f16b3e52c23861f617e49ef74fdc2c6ebaef6af906f04fff81  guix-build-58857560fcd2/output/powerpc64-linux-gnu/bitcoin-58857560fcd2-powerpc64-linux-gnu-debug.tar.gz
8b42e3a20dba091011bee1cb72e9f494f88ea781c94124e1f70fd2c22797cbb8  guix-build-58857560fcd2/output/powerpc64-linux-gnu/bitcoin-58857560fcd2-powerpc64-linux-gnu.tar.gz
6d67c99cc4beccc8ea48e579b8b4f75dc47a91597e335074d806535c8def958b  guix-build-58857560fcd2/output/powerpc64le-linux-gnu/SHA256SUMS.part
f366d52438137962322a4883c1883666e97169488f0b9ddc21ce067e3944396c  guix-build-58857560fcd2/output/powerpc64le-linux-gnu/bitcoin-58857560fcd2-powerpc64le-linux-gnu-debug.tar.gz
7cf04fa623e217bcccbb42220487f298009d460dd5cb471a8f3bae22ef3e9802  guix-build-58857560fcd2/output/powerpc64le-linux-gnu/bitcoin-58857560fcd2-powerpc64le-linux-gnu.tar.gz
3a9a8990aeb0c56a7b584d1823886c73990645770659a63c45e4b85d1c3f8d65  guix-build-58857560fcd2/output/riscv64-linux-gnu/SHA256SUMS.part
5f8f663779b3f7196da9f1c9b40be7b2a8e2b33fdb6baf673520c0b07b23ce26  guix-build-58857560fcd2/output/riscv64-linux-gnu/bitcoin-58857560fcd2-riscv64-linux-gnu-debug.tar.gz
3f43cf17a71e05506822fdbacfd8b7f3af9c739fd131842014dd80c92062d566  guix-build-58857560fcd2/output/riscv64-linux-gnu/bitcoin-58857560fcd2-riscv64-linux-gnu.tar.gz
3f89ecc812a1cd0d6009a119957b9bc5831f37249153b5fafe3268e4dd3bb59c  guix-build-58857560fcd2/output/x86_64-apple-darwin18/SHA256SUMS.part
a828f7a623d38d549992af3035254ddde5a26e62638fe23a9bd76d2867683ce4  guix-build-58857560fcd2/output/x86_64-apple-darwin18/bitcoin-58857560fcd2-osx-unsigned.dmg
d24624964b6b68bfb03c88f49a22170f6fb0c16f4974949cde830be9b780b7f9  guix-build-58857560fcd2/output/x86_64-apple-darwin18/bitcoin-58857560fcd2-osx-unsigned.tar.gz
7e4f0ca9b199a33acdabdfb7d6d6ae6524f1d5f3bb924951d55b792e3ad19dad  guix-build-58857560fcd2/output/x86_64-apple-darwin18/bitcoin-58857560fcd2-osx64.tar.gz
bb466bd2a42c2914bf70b3b27335123eccad39b569d334c6f69ff08459c8ee6b  guix-build-58857560fcd2/output/x86_64-linux-gnu/SHA256SUMS.part
430bc8eb7506c1041db17b2393927f82be44921c00f4a698477ab3a7cdd31313  guix-build-58857560fcd2/output/x86_64-linux-gnu/bitcoin-58857560fcd2-x86_64-linux-gnu-debug.tar.gz
ab04cde29a2febcad6f50f288f6bbf026fc1a2c3309cd8f6276548d79c1d422e  guix-build-58857560fcd2/output/x86_64-linux-gnu/bitcoin-58857560fcd2-x86_64-linux-gnu.tar.gz
014a940eadbcba286cac1f2df5e6d6ea1d21a3623d98d8b1300ea44ac0e9efc5  guix-build-58857560fcd2/output/x86_64-w64-mingw32/SHA256SUMS.part
99a38df35244d34ae8d247953e6f5903713d6098e66a5a41d509074dc216b926  guix-build-58857560fcd2/output/x86_64-w64-mingw32/bitcoin-58857560fcd2-win-unsigned.tar.gz
a981dcde57666283d6b3bb9b0bbe2b1e54cb2b25b7301f3ecd3c5819acfd9823  guix-build-58857560fcd2/output/x86_64-w64-mingw32/bitcoin-58857560fcd2-win64-debug.zip
862d38ba5b4120fb55f9b4a664379c1e2ccc2940bc54e46bb8884e9f77245e81  guix-build-58857560fcd2/output/x86_64-w64-mingw32/bitcoin-58857560fcd2-win64-setup-unsigned.exe
539046ae22daf063c96fefe88359b9d3a85ea5f37fd27c56abd5bcb98490e290  guix-build-58857560fcd2/output/x86_64-w64-mingw32/bitcoin-58857560fcd2-win64.zip

laanwj commented at 11:09 AM on September 9, 2021: member

Code review ACK 58857560fcd299ae4aa03250298acfe63b26c305 Agree with @kristapsk the include-change though—it can't be related to the preprocessor logic change, would make sense to split to a separate commit.

util: remove libevent <= 2.0.18 back-compat code

Now that we require libevent >=2.0.21, remove backwards compatibility
code for older versions.

6045a14642

fanquake force-pushed on Sep 9, 2021

fanquake commented at 1:38 PM on September 9, 2021: member

would make sense to split to a separate commit.

I've just dropped it for now.

kristapsk approved

kristapsk commented at 1:49 PM on September 9, 2021: contributor

ACK 6045a1464252075f4135bd4a69d202d55d124eb2

fanquake merged this on Sep 9, 2021

fanquake closed this on Sep 9, 2021

fanquake deleted the branch on Sep 9, 2021

MarcoFalke removed the label DrahtBot Guix build requested on Sep 9, 2021

DrahtBot commented at 4:23 PM on September 9, 2021: member

Guix builds

File	commit 7d7d5e8efde944565be0d3eb25ed5a5279b8dabe<br>(master)	commit a2dc538b834ac7ba82073aaa56f83336e63941d5<br>(master and this pull)
SHA256SUMS.part	`208c372633b36a14...`	`721143c1b770d94a...`
*-aarch64-linux-gnu-debug.tar.gz	`c67f288406aa7e86...`	`684ba0e09c503653...`
*-aarch64-linux-gnu.tar.gz	`2fb567cbd987f445...`	`fbc3a8ebbc2a45e4...`
*-arm-linux-gnueabihf-debug.tar.gz	`fe69f514024db1ec...`	`61d7949b153c1571...`
*-arm-linux-gnueabihf.tar.gz	`116e8901a533fec0...`	`92dbe070886c6ea9...`
*-osx-unsigned.dmg	`b69f1bc50b4ed886...`	`42681ecd45fcec41...`
*-osx-unsigned.tar.gz	`fa23d8c27346dfc7...`	`878ea4e6ec7cdedb...`
*-osx64.tar.gz	`a1666638345bcb65...`	`df1c4bce10f29d52...`
*-powerpc64-linux-gnu-debug.tar.gz	`2475b89b188b39e7...`	`0c6ef24113b7233a...`
*-powerpc64-linux-gnu.tar.gz	`e4d99663c9d02050...`	`78d44af2ad49bd26...`
*-powerpc64le-linux-gnu-debug.tar.gz	`01178775b74a2ed6...`	`f5e2620ee68f579c...`
*-powerpc64le-linux-gnu.tar.gz	`e66271dc8720758a...`	`de0afeb8f7f33263...`
*-riscv64-linux-gnu-debug.tar.gz	`e2efa2373951ba69...`	`4351423eb90def38...`
*-riscv64-linux-gnu.tar.gz	`fa44c6068643295d...`	`524255aa70883920...`
*-win-unsigned.tar.gz	`19d88eed19e66241...`	`bbc1e031a2352238...`
*-win64-debug.zip	`39ea06c2c0767863...`	`955a11d4e8735441...`
*-win64-setup-unsigned.exe	`b5b5d6cd2d33214a...`	`c2eda773fb6e68e6...`
*-win64.zip	`8ebb75845c3016c3...`	`8e365d625296614b...`
*-x86_64-linux-gnu-debug.tar.gz	`294cfc3b9d011f0e...`	`14670c44274c5c80...`
*-x86_64-linux-gnu.tar.gz	`bf9160925feb2ced...`	`af4f66a1d9449c29...`
*.tar.gz	`23996880186a2e7c...`	`6ae79b876fafb236...`
guix_build.log	`24119b58f65c2119...`	`7095e6c47effacf2...`
guix_build.log.diff		`ddf7517a6a9dc09f...`

sidhujag referenced this in commit 969845a354 on Sep 11, 2021

DrahtBot locked this on Oct 30, 2022