Remove testnet3

Sjors · Mar 3, 2025 · 5d6aa13 · 5d6aa13
1 parent 301017c
commit 5d6aa13
Show file tree

Hide file tree

Showing 39 changed files with 98 additions and 628 deletions.
diff --git a/contrib/completions/bash/bitcoin-cli.bash b/contrib/completions/bash/bitcoin-cli.bash
@@ -9,7 +9,7 @@ _bitcoin_rpc() {
     local rpcargs=()
     for i in ${COMP_LINE}; do
         case "$i" in
-            -conf=*|-datadir=*|-regtest|-rpc*|-testnet|-testnet4)
+            -conf=*|-datadir=*|-regtest|-rpc*|-testnet4)
                 rpcargs=( "${rpcargs[@]}" "$i" )
                 ;;
         esac

diff --git a/contrib/devtools/gen-bitcoin-conf.sh b/contrib/devtools/gen-bitcoin-conf.sh
@@ -72,9 +72,6 @@ cat >> "${EXAMPLE_CONF_FILE}" << 'EOF'
 # Options for mainnet
 [main]
 
-# Options for testnet3
-[test]
-
 # Options for testnet4
 [testnet4]
 

diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg
@@ -7,9 +7,6 @@ host=127.0.0.1
 #mainnet default
 port=8332
 
-#testnet default
-#port=18332
-
 #regtest default
 #port=18443
 
@@ -26,11 +23,6 @@ netmagic=f9beb4d9
 genesis=000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f
 input=/home/example/.bitcoin/blocks
 
-# testnet
-#netmagic=0b110907
-#genesis=000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943
-#input=/home/example/.bitcoin/testnet3/blocks
-
 # regtest
 #netmagic=fabfb5da
 #genesis=0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206

diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md
@@ -17,10 +17,8 @@ curl https://bitcoin.sipa.be/seeds.txt.gz | gzip -dc > seeds_main.txt
 curl https://mainnet.achownodes.xyz/seeds.txt.gz | gzip -dc >> seeds_main.txt
 curl https://21.ninja/seeds.txt.gz | gzip -dc >> seeds_main.txt
 curl https://luke.dashjr.org/programs/bitcoin/files/charts/seeds.txt >> seeds_main.txt
-curl https://testnet.achownodes.xyz/seeds.txt.gz | gzip -dc > seeds_test.txt
 curl https://raw.githubusercontent.com/asmap/asmap-data/main/latest_asmap.dat > asmap-filled.dat
 python3 makeseeds.py -a asmap-filled.dat -s seeds_main.txt > nodes_main.txt
-python3 makeseeds.py -a asmap-filled.dat -s seeds_test.txt > nodes_test.txt
 # TODO: Uncomment when a seeder publishes seeds.txt.gz for testnet4
 # python3 makeseeds.py -a asmap-filled.dat -s seeds_testnet4.txt -m 30000 > nodes_testnet4.txt
 python3 generate-seeds.py . > ../../src/chainparamsseeds.h

diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt
diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py
@@ -7,12 +7,12 @@
     ZMQ example using python3's asyncio
 
     Bitcoin should be started with the command line arguments:
-        bitcoind -testnet -daemon \
-                -zmqpubrawtx=tcp://127.0.0.1:28332 \
-                -zmqpubrawblock=tcp://127.0.0.1:28332 \
-                -zmqpubhashtx=tcp://127.0.0.1:28332 \
-                -zmqpubhashblock=tcp://127.0.0.1:28332 \
-                -zmqpubsequence=tcp://127.0.0.1:28332
+        bitcoind -testnet4 -daemon \
+                -zmqpubrawtx=tcp://127.0.0.1:48332 \
+                -zmqpubrawblock=tcp://127.0.0.1:48332 \
+                -zmqpubhashtx=tcp://127.0.0.1:48332 \
+                -zmqpubhashblock=tcp://127.0.0.1:48332 \
+                -zmqpubsequence=tcp://127.0.0.1:48332
 
     We use the asyncio library here.  `self.handle()` installs itself as a
     future at the end of the function.  Since it never returns with the event
@@ -34,7 +34,7 @@
     print("This example only works with Python 3.5 and greater")
     sys.exit(1)
 
-port = 28332
+port = 48332
 
 class ZMQHandler():
     def __init__(self):