Merge rm_minisketch-26+k

ci/test/03_test_script.sh

@@ -152,7 +152,6 @@ du -sh "${PREVIOUS_RELEASES_DIR}"
 if [[ $HOST = *-mingw32 ]]; then
   # Generate all binaries, so that they can be wrapped
   make "$MAKEJOBS" -C src/secp256k1 VERBOSE=1
-  make "$MAKEJOBS" -C src minisketch/test.exe VERBOSE=1
   "${BASE_ROOT_DIR}/ci/test/wrap-wine.sh"
 fi
 

contrib/guix/libexec/make_release_tarball.sh

@@ -14,7 +14,7 @@ set -ex
 GIT_ARCHIVE="$1"
 DISTNAME="$2"
 
-git archive --prefix="${DISTNAME}/" HEAD | tar -xp
+git archive --prefix="${DISTNAME}/" HEAD | tar -xp --exclude '*minisketch*'
 
 # Generate correct build info file from git, before we lose git
 GIT_BUILD_INFO="$(share/genbuild.sh /dev/stdout)"

src/Makefile.am

@@ -235,7 +235,6 @@ BITCOIN_CORE_H = \
   node/mempool_persist_args.h \
   node/miner.h \
   node/mini_miner.h \
-  node/minisketchwrapper.h \
   node/peerman_args.h \
   node/protocol_version.h \
   node/psbt.h \
@@ -437,7 +436,6 @@ libbitcoin_node_a_SOURCES = \
   node/mempool_persist_args.cpp \
   node/miner.cpp \
   node/mini_miner.cpp \
-  node/minisketchwrapper.cpp \
   node/peerman_args.cpp \
   node/psbt.cpp \
   node/transaction.cpp \
@@ -1137,8 +1135,6 @@ endif
 	 echo "};"; \
 	} > "$@.new" && mv -f "$@.new" "$@"
 
-include Makefile.minisketch.include
-
 if EMBEDDED_LEVELDB
 include Makefile.crc32c.include
 include Makefile.leveldb.include

src/Makefile.test.include

@@ -110,7 +110,6 @@ BITCOIN_TESTS =\
   test/miner_tests.cpp \
   test/miniminer_tests.cpp \
   test/miniscript_tests.cpp \
-  test/minisketch_tests.cpp \
   test/multisig_tests.cpp \
   test/net_peer_connection_tests.cpp \
   test/net_peer_eviction_tests.cpp \
@@ -330,7 +329,6 @@ test_fuzz_fuzz_SOURCES = \
  test/fuzz/merkleblock.cpp \
  test/fuzz/message.cpp \
  test/fuzz/miniscript.cpp \
- test/fuzz/minisketch.cpp \
  test/fuzz/mini_miner.cpp \
  test/fuzz/muhash.cpp \
  test/fuzz/multiplication_overflow.cpp \