Switch back to rust-bitcoin/rust-bitcoincore-rpc

diff --git a/src/blockchain/rpc.rs b/src/blockchain/rpc.rs
index 6d1d94d0e0c83b74b28eaef9b7b75670145691be..d4a5beca18b8b316d7588020603137863e744d2b 100644 (file)
--- a/src/blockchain/rpc.rs
+++ b/src/blockchain/rpc.rs
@@ -38,13 +38,13 @@ use crate::database::{BatchDatabase, DatabaseUtils};
 use crate::descriptor::{get_checksum, IntoWalletDescriptor};
 use crate::wallet::utils::SecpCtx;
 use crate::{ConfirmationTime, Error, FeeRate, KeychainKind, LocalUtxo, TransactionDetails};
-use core_rpc::json::{
+use bitcoincore_rpc::json::{
     GetAddressInfoResultLabel, ImportMultiOptions, ImportMultiRequest,
     ImportMultiRequestScriptPubkey, ImportMultiRescanSince,
 };
-use core_rpc::jsonrpc::serde_json::Value;
-use core_rpc::Auth as RpcAuth;
-use core_rpc::{Client, RpcApi};
+use bitcoincore_rpc::jsonrpc::serde_json::Value;
+use bitcoincore_rpc::Auth as RpcAuth;
+use bitcoincore_rpc::{Client, RpcApi};
 use log::debug;
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, HashSet};
@@ -82,7 +82,7 @@ pub struct RpcConfig {
     pub skip_blocks: Option<u32>,
 }
 
-/// This struct is equivalent to [core_rpc::Auth] but it implements [serde::Serialize]
+/// This struct is equivalent to [bitcoincore_rpc::Auth] but it implements [serde::Serialize]
 /// To be removed once upstream equivalent is implementing Serialize (json serialization format
 /// should be the same), see [rust-bitcoincore-rpc/pull/181](https://github.com/rust-bitcoin/rust-bitcoincore-rpc/pull/181)
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]

diff --git a/src/error.rs b/src/error.rs
index d2875c8197cf8be51703323b91ab40daa93c3eb6..a51fe21500a972a7b0128699c9e1735d24d3abb2 100644 (file)
--- a/src/error.rs
+++ b/src/error.rs
@@ -139,7 +139,7 @@ pub enum Error {
     Sled(sled::Error),
     #[cfg(feature = "rpc")]
     /// Rpc client error
-    Rpc(core_rpc::Error),
+    Rpc(bitcoincore_rpc::Error),
     #[cfg(feature = "sqlite")]
     /// Rusqlite client error
     Rusqlite(rusqlite::Error),
@@ -196,7 +196,7 @@ impl_error!(electrum_client::Error, Electrum);
 #[cfg(feature = "key-value-db")]
 impl_error!(sled::Error, Sled);
 #[cfg(feature = "rpc")]
-impl_error!(core_rpc::Error, Rpc);
+impl_error!(bitcoincore_rpc::Error, Rpc);
 #[cfg(feature = "sqlite")]
 impl_error!(rusqlite::Error, Rusqlite);
 

diff --git a/src/lib.rs b/src/lib.rs
index 6f2ee58d57f8f55a541b26051a5ca2e4fb33a089..37ab33db6d13c7dfe166b20967dd5ad915d9dd16 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -236,7 +236,7 @@ extern crate bdk_macros;
 extern crate lazy_static;
 
 #[cfg(feature = "rpc")]
-pub extern crate core_rpc;
+pub extern crate bitcoincore_rpc;
 
 #[cfg(feature = "electrum")]
 pub extern crate electrum_client;