Skip to content
This repository was archived by the owner on Nov 26, 2024. It is now read-only.

Commit 8fa4552

Browse files
committed
Remove v26 stuff
There are two problems with the v26 stuff: 1. the `bitcoind` crate does not support v26.1 (only v26.0) 2. the generatetoaddress method is gone in v26 and I don't know where this functionality went ATM For now, just remove the v26 stuff and leave it for later.
1 parent 123b71f commit 8fa4552

File tree

11 files changed

+5
-476
lines changed

11 files changed

+5
-476
lines changed

contrib/run_bitcoind.sh

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,19 @@ Usage:
1717
1818
COMMAND
1919
- all Start all known bitcoind versions.
20-
- start [KNOWN_VERSION] Start bitcoind nodes, defaults to v26.
20+
- start [KNOWN_VERSION] Start bitcoind nodes, defaults to v22.
2121
- stop Kill all bitcoind nodes using 'pkill bitcoind'.
2222
2323
KNOWN_VERSION
2424
- v17 Bitcoin Core v0.17.1
2525
- v22 Bitcoin Core v22.1
26-
- v26 Bitcoin Core v26.1
2726
2827
EOF
2928
}
3029

3130
main() {
3231
local cmd="${1:-usage}"
33-
local version="${2:-v26}"
32+
local version="${2:-v22}"
3433

3534
# FIXME: This is a hackish way to get the help flag.
3635
if [ "$cmd" = "usage" ] || [ "$cmd" = "-h" ] || [ "$cmd" = "--help" ] || [ "$cmd" = "help" ]; then
@@ -42,7 +41,6 @@ main() {
4241
all)
4342
start "v17"
4443
start "v22"
45-
start "v26"
4644
;;
4745

4846
start)
@@ -53,7 +51,6 @@ main() {
5351
pkill bitcoind
5452
rm -rf "/tmp/rust-bitcoind-json-rpc-0.17.1/2/regtest/wallets" > /dev/null
5553
rm -rf "/tmp/rust-bitcoind-json-rpc-22.1/2/regtest/wallets" > /dev/null
56-
rm -rf "/tmp/rust-bitcoind-json-rpc-26.1/2/regtest/wallets" > /dev/null
5754
;;
5855
*)
5956
usage
@@ -73,12 +70,6 @@ start() {
7370
run_bitcoind "$version" "$version_number" "$version_id"
7471
;;
7572

76-
v26)
77-
local version_number="26.1"
78-
local version_id="261"
79-
run_bitcoind "$version" "$version_number" "$version_id"
80-
;;
81-
8273
v22)
8374
local version_number="22.1"
8475
local version_id="221"
@@ -92,9 +83,9 @@ start() {
9283
}
9384

9485
run_bitcoind() {
95-
local version="$1" # eg, v26
96-
local version_number="$2" # eg, 26.1
97-
local version_id="$3" # eg, 261
86+
local version="$1" # eg, v22
87+
local version_number="$2" # eg, 22.1
88+
local version_id="$3" # eg, 221
9889

9990
local test_dir="/tmp/rust-bitcoind-json-rpc-${version_number}"
10091
local bitcoind="/opt/bitcoin-${version_number}/bin/bitcoind"

src/client_sync/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
mod error;
66
pub mod v17;
77
pub mod v22;
8-
pub mod v26;
98

109
use std::fs::File;
1110
use std::io::{BufRead, BufReader};

src/client_sync/v26.rs

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/json/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
88
pub mod v17;
99
pub mod v22;
10-
pub mod v26;

src/json/v26/blockchain.rs

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/json/v26/mod.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/json/v26/network.rs

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/json/v26/rpc-api.txt

Lines changed: 0 additions & 172 deletions
This file was deleted.

src/json/v26/wallet/convert.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)