frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Steve Myers 2021-10-27 13:52:18 -07:00
parent ee8b992f8b
commit 8781599740
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/blockchain/rpc.rs
View File

@ -38,13 +38,13 @@ use crate::database::{BatchDatabase, DatabaseUtils};
use crate::descriptor::{get_checksum, IntoWalletDescriptor}; use crate::descriptor::{get_checksum, IntoWalletDescriptor};
use crate::wallet::utils::SecpCtx; use crate::wallet::utils::SecpCtx;
use crate::{ConfirmationTime, Error, FeeRate, KeychainKind, LocalUtxo, TransactionDetails}; use crate::{ConfirmationTime, Error, FeeRate, KeychainKind, LocalUtxo, TransactionDetails};
use core_rpc::json::{ use bitcoincore_rpc::json::{
GetAddressInfoResultLabel, ImportMultiOptions, ImportMultiRequest, GetAddressInfoResultLabel, ImportMultiOptions, ImportMultiRequest,
ImportMultiRequestScriptPubkey, ImportMultiRescanSince, ImportMultiRequestScriptPubkey, ImportMultiRescanSince,
}; };
use core_rpc::jsonrpc::serde_json::Value; use bitcoincore_rpc::jsonrpc::serde_json::Value;
use core_rpc::Auth as RpcAuth; use bitcoincore_rpc::Auth as RpcAuth;
use core_rpc::{Client, RpcApi}; use bitcoincore_rpc::{Client, RpcApi};
use log::debug; use log::debug;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
@ -82,7 +82,7 @@ pub struct RpcConfig {
pub skip_blocks: Option<u32>, 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 /// 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) /// 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)] #[derive(Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]

4
src/error.rs
View File

@ -139,7 +139,7 @@ pub enum Error {
Sled(sled::Error), Sled(sled::Error),
#[cfg(feature = "rpc")] #[cfg(feature = "rpc")]
/// Rpc client error /// Rpc client error
Rpc(core_rpc::Error), Rpc(bitcoincore_rpc::Error),
#[cfg(feature = "sqlite")] #[cfg(feature = "sqlite")]
/// Rusqlite client error /// Rusqlite client error
Rusqlite(rusqlite::Error), Rusqlite(rusqlite::Error),
@ -196,7 +196,7 @@ impl_error!(electrum_client::Error, Electrum);
#[cfg(feature = "key-value-db")] #[cfg(feature = "key-value-db")]
impl_error!(sled::Error, Sled); impl_error!(sled::Error, Sled);
#[cfg(feature = "rpc")] #[cfg(feature = "rpc")]
impl_error!(core_rpc::Error, Rpc); impl_error!(bitcoincore_rpc::Error, Rpc);
#[cfg(feature = "sqlite")] #[cfg(feature = "sqlite")]
impl_error!(rusqlite::Error, Rusqlite); impl_error!(rusqlite::Error, Rusqlite);

2
src/lib.rs
View File

@ -236,7 +236,7 @@ extern crate bdk_macros;
extern crate lazy_static; extern crate lazy_static;
#[cfg(feature = "rpc")] #[cfg(feature = "rpc")]
pub extern crate core_rpc; pub extern crate bitcoincore_rpc;
#[cfg(feature = "electrum")] #[cfg(feature = "electrum")]
pub extern crate electrum_client; pub extern crate electrum_client;