From 8926fac6d7f18a7277504eea25e9305f8d329d64 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Thu, 13 Jun 2024 09:05:07 +1000 Subject: [PATCH] Re-name bitcoind crate I don't really want to rug `bitcoincore-rpc` which is still using `bitcoind` so lets re-name it here and release it as a different crate until the dust settles and we work out where this repo is going to live. --- Cargo-minimal.lock | 4 ++-- Cargo-recent.lock | 4 ++-- Cargo.toml | 5 +---- integration_test/Cargo.toml | 6 +++--- {bitcoind => regtest}/CHANGELOG.md | 0 {bitcoind => regtest}/Cargo.toml | 15 ++++++--------- {bitcoind => regtest}/LICENSE | 0 {bitcoind => regtest}/README.md | 0 {bitcoind => regtest}/build.rs | 0 {bitcoind => regtest}/clippy.toml | 0 .../sha256/bitcoin-core-0.17.2-SHA256SUMS.asc | 0 .../sha256/bitcoin-core-0.18.1-SHA256SUMS.asc | 0 .../sha256/bitcoin-core-0.19.1-SHA256SUMS.asc | 0 .../sha256/bitcoin-core-0.20.2-SHA256SUMS.asc | 0 .../sha256/bitcoin-core-0.21.2-SHA256SUMS.asc | 0 .../sha256/bitcoin-core-22.0-SHA256SUMS | 0 .../sha256/bitcoin-core-22.1-SHA256SUMS | 0 .../sha256/bitcoin-core-23.0-SHA256SUMS | 0 .../sha256/bitcoin-core-23.1-SHA256SUMS | 0 .../sha256/bitcoin-core-23.2-SHA256SUMS | 0 .../sha256/bitcoin-core-24.0.1-SHA256SUMS | 0 .../sha256/bitcoin-core-24.1-SHA256SUMS | 0 .../sha256/bitcoin-core-24.2-SHA256SUMS | 0 .../sha256/bitcoin-core-25.0-SHA256SUMS | 0 .../sha256/bitcoin-core-25.1-SHA256SUMS | 0 .../sha256/bitcoin-core-25.2-SHA256SUMS | 0 .../sha256/bitcoin-core-26.0-SHA256SUMS | 0 {bitcoind => regtest}/src/client_versions.rs | 0 {bitcoind => regtest}/src/lib.rs | 1 + {bitcoind => regtest}/src/versions.rs | 0 30 files changed, 15 insertions(+), 20 deletions(-) rename {bitcoind => regtest}/CHANGELOG.md (100%) rename {bitcoind => regtest}/Cargo.toml (87%) rename {bitcoind => regtest}/LICENSE (100%) rename {bitcoind => regtest}/README.md (100%) rename {bitcoind => regtest}/build.rs (100%) rename {bitcoind => regtest}/clippy.toml (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-0.17.2-SHA256SUMS.asc (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-0.18.1-SHA256SUMS.asc (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-0.19.1-SHA256SUMS.asc (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-0.20.2-SHA256SUMS.asc (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-0.21.2-SHA256SUMS.asc (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-22.0-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-22.1-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-23.0-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-23.1-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-23.2-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-24.0.1-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-24.1-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-24.2-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-25.0-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-25.1-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-25.2-SHA256SUMS (100%) rename {bitcoind => regtest}/sha256/bitcoin-core-26.0-SHA256SUMS (100%) rename {bitcoind => regtest}/src/client_versions.rs (100%) rename {bitcoind => regtest}/src/lib.rs (99%) rename {bitcoind => regtest}/src/versions.rs (100%) diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock index 98e619b..35640d1 100644 --- a/Cargo-minimal.lock +++ b/Cargo-minimal.lock @@ -255,5 +255,5 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[patch.unused]] -name = "bitcoind" -version = "0.37.0" +name = "bitcoind-json-rpc-regtest" +version = "0.1.0" diff --git a/Cargo-recent.lock b/Cargo-recent.lock index 98e619b..35640d1 100644 --- a/Cargo-recent.lock +++ b/Cargo-recent.lock @@ -255,5 +255,5 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[patch.unused]] -name = "bitcoind" -version = "0.37.0" +name = "bitcoind-json-rpc-regtest" +version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 03d8497..2b6b86f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = ["client", "json"] -exclude = ["integration_test", "bitcoind"] +exclude = ["integration_test", "regtest"] resolver = "2" [patch.crates-io.bitcoind-json-rpc-client] @@ -8,6 +8,3 @@ path = "client" [patch.crates-io.bitcoind-json-rpc-types] path = "json" - -[patch.crates-io.bitcoind] -path = "bitcoind" diff --git a/integration_test/Cargo.toml b/integration_test/Cargo.toml index 5bee96a..1583cf0 100644 --- a/integration_test/Cargo.toml +++ b/integration_test/Cargo.toml @@ -47,7 +47,7 @@ edition = "2021" [dependencies] bitcoin = { version = "0.32.0", default-features = false, features = ["std", "serde"] } client = { package = "bitcoind-json-rpc-client", version = "0.1.0", default-features = false, features = ["client-sync"] } -bitcoind = { version = "0.37.0", default-features = false, features = [] } +bitcoind = { package = "bitcoind-json-rpc-regtest", version = "0.1.0", default-features = false, features = [] } rand = "0.8.5" env_logger = "0.9.0" @@ -59,5 +59,5 @@ path = "../client" [patch.crates-io.bitcoind-json-rpc-types] path = "../json" -[patch.crates-io.bitcoind] -path = "../bitcoind" +[patch.crates-io.bitcoind-json-rpc-regtest] +path = "../regtest" diff --git a/bitcoind/CHANGELOG.md b/regtest/CHANGELOG.md similarity index 100% rename from bitcoind/CHANGELOG.md rename to regtest/CHANGELOG.md diff --git a/bitcoind/Cargo.toml b/regtest/Cargo.toml similarity index 87% rename from bitcoind/Cargo.toml rename to regtest/Cargo.toml index 6e90703..2480559 100644 --- a/bitcoind/Cargo.toml +++ b/regtest/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "bitcoind" -version = "0.37.0" -authors = ["Riccardo Casatta "] -description = "Utility to run a regtest bitcoind process, useful in integration testing environment" +name = "bitcoind-json-rpc-regtest" +version = "0.1.0" +authors = ["Riccardo Casatta ", "Tobin C. Harding "] +description = "Utility to run a regtest bitcoind process, useful in integration testing environments" license = "MIT" -repository = "https://github.com/RCasatta/bitcoind" -documentation = "https://docs.rs/bitcoind/" +repository = "https://github.com/tcharding/rust-bitcoind-json-rpc" +documentation = "https://docs.rs/bitcoind-json-rpc-regtest/" rust-version = "1.56.1" edition = "2018" categories = ["cryptography::cryptocurrencies", "development-tools::testing"] @@ -71,6 +71,3 @@ path = "../client" [patch.crates-io.bitcoind-json-rpc-types] path = "../json" - -[patch.crates-io.bitcoind] -path = "../bitcoind" diff --git a/bitcoind/LICENSE b/regtest/LICENSE similarity index 100% rename from bitcoind/LICENSE rename to regtest/LICENSE diff --git a/bitcoind/README.md b/regtest/README.md similarity index 100% rename from bitcoind/README.md rename to regtest/README.md diff --git a/bitcoind/build.rs b/regtest/build.rs similarity index 100% rename from bitcoind/build.rs rename to regtest/build.rs diff --git a/bitcoind/clippy.toml b/regtest/clippy.toml similarity index 100% rename from bitcoind/clippy.toml rename to regtest/clippy.toml diff --git a/bitcoind/sha256/bitcoin-core-0.17.2-SHA256SUMS.asc b/regtest/sha256/bitcoin-core-0.17.2-SHA256SUMS.asc similarity index 100% rename from bitcoind/sha256/bitcoin-core-0.17.2-SHA256SUMS.asc rename to regtest/sha256/bitcoin-core-0.17.2-SHA256SUMS.asc diff --git a/bitcoind/sha256/bitcoin-core-0.18.1-SHA256SUMS.asc b/regtest/sha256/bitcoin-core-0.18.1-SHA256SUMS.asc similarity index 100% rename from bitcoind/sha256/bitcoin-core-0.18.1-SHA256SUMS.asc rename to regtest/sha256/bitcoin-core-0.18.1-SHA256SUMS.asc diff --git a/bitcoind/sha256/bitcoin-core-0.19.1-SHA256SUMS.asc b/regtest/sha256/bitcoin-core-0.19.1-SHA256SUMS.asc similarity index 100% rename from bitcoind/sha256/bitcoin-core-0.19.1-SHA256SUMS.asc rename to regtest/sha256/bitcoin-core-0.19.1-SHA256SUMS.asc diff --git a/bitcoind/sha256/bitcoin-core-0.20.2-SHA256SUMS.asc b/regtest/sha256/bitcoin-core-0.20.2-SHA256SUMS.asc similarity index 100% rename from bitcoind/sha256/bitcoin-core-0.20.2-SHA256SUMS.asc rename to regtest/sha256/bitcoin-core-0.20.2-SHA256SUMS.asc diff --git a/bitcoind/sha256/bitcoin-core-0.21.2-SHA256SUMS.asc b/regtest/sha256/bitcoin-core-0.21.2-SHA256SUMS.asc similarity index 100% rename from bitcoind/sha256/bitcoin-core-0.21.2-SHA256SUMS.asc rename to regtest/sha256/bitcoin-core-0.21.2-SHA256SUMS.asc diff --git a/bitcoind/sha256/bitcoin-core-22.0-SHA256SUMS b/regtest/sha256/bitcoin-core-22.0-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-22.0-SHA256SUMS rename to regtest/sha256/bitcoin-core-22.0-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-22.1-SHA256SUMS b/regtest/sha256/bitcoin-core-22.1-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-22.1-SHA256SUMS rename to regtest/sha256/bitcoin-core-22.1-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-23.0-SHA256SUMS b/regtest/sha256/bitcoin-core-23.0-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-23.0-SHA256SUMS rename to regtest/sha256/bitcoin-core-23.0-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-23.1-SHA256SUMS b/regtest/sha256/bitcoin-core-23.1-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-23.1-SHA256SUMS rename to regtest/sha256/bitcoin-core-23.1-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-23.2-SHA256SUMS b/regtest/sha256/bitcoin-core-23.2-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-23.2-SHA256SUMS rename to regtest/sha256/bitcoin-core-23.2-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-24.0.1-SHA256SUMS b/regtest/sha256/bitcoin-core-24.0.1-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-24.0.1-SHA256SUMS rename to regtest/sha256/bitcoin-core-24.0.1-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-24.1-SHA256SUMS b/regtest/sha256/bitcoin-core-24.1-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-24.1-SHA256SUMS rename to regtest/sha256/bitcoin-core-24.1-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-24.2-SHA256SUMS b/regtest/sha256/bitcoin-core-24.2-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-24.2-SHA256SUMS rename to regtest/sha256/bitcoin-core-24.2-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-25.0-SHA256SUMS b/regtest/sha256/bitcoin-core-25.0-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-25.0-SHA256SUMS rename to regtest/sha256/bitcoin-core-25.0-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-25.1-SHA256SUMS b/regtest/sha256/bitcoin-core-25.1-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-25.1-SHA256SUMS rename to regtest/sha256/bitcoin-core-25.1-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-25.2-SHA256SUMS b/regtest/sha256/bitcoin-core-25.2-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-25.2-SHA256SUMS rename to regtest/sha256/bitcoin-core-25.2-SHA256SUMS diff --git a/bitcoind/sha256/bitcoin-core-26.0-SHA256SUMS b/regtest/sha256/bitcoin-core-26.0-SHA256SUMS similarity index 100% rename from bitcoind/sha256/bitcoin-core-26.0-SHA256SUMS rename to regtest/sha256/bitcoin-core-26.0-SHA256SUMS diff --git a/bitcoind/src/client_versions.rs b/regtest/src/client_versions.rs similarity index 100% rename from bitcoind/src/client_versions.rs rename to regtest/src/client_versions.rs diff --git a/bitcoind/src/lib.rs b/regtest/src/lib.rs similarity index 99% rename from bitcoind/src/lib.rs rename to regtest/src/lib.rs index e52aa89..cadb9a3 100644 --- a/bitcoind/src/lib.rs +++ b/regtest/src/lib.rs @@ -189,6 +189,7 @@ const INVALID_ARGS: [&str; 2] = ["-rpcuser", "-rpcpassword"]; /// /// Default values: /// ``` +/// use bitcoind_json_rpc_regtest as bitcoind; /// let mut conf = bitcoind::Conf::default(); /// conf.args = vec!["-regtest", "-fallbackfee=0.0001"]; /// conf.view_stdout = false; diff --git a/bitcoind/src/versions.rs b/regtest/src/versions.rs similarity index 100% rename from bitcoind/src/versions.rs rename to regtest/src/versions.rs