Skip to content

Commit e58cc87

Browse files
committed
rust: remove gdk_common qualifier inside code
always use import, this is propedeutic to re-organization
1 parent ad348d2 commit e58cc87

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

subprojects/gdk_rust/gdk_electrum/src/error.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::store::StoreMeta;
22
use crate::{BETxid, State};
33
use aes_gcm_siv::aead;
4+
use gdk_common::error::Error as CommonError;
45
use serde::ser::Serialize;
56
use std::convert::From;
67
use std::fmt::Display;
@@ -49,7 +50,7 @@ pub enum Error {
4950
ElementsPset(elements::pset::Error),
5051
PsetBlindError(elements::pset::PsetBlindError),
5152
UnblindError(elements::UnblindError),
52-
Common(gdk_common::error::Error),
53+
Common(CommonError),
5354
Send(std::sync::mpsc::SendError<()>),
5455
Encryption(block_modes::BlockModeError),
5556
Secp256k1(bitcoin::secp256k1::Error),
@@ -204,8 +205,8 @@ impl From<elements::UnblindError> for Error {
204205
}
205206
}
206207

207-
impl From<gdk_common::error::Error> for Error {
208-
fn from(err: gdk_common::error::Error) -> Self {
208+
impl From<CommonError> for Error {
209+
fn from(err: CommonError) -> Self {
209210
Error::Common(err)
210211
}
211212
}

subprojects/gdk_rust/src/error.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
use gdk_common::model::ExchangeRateError;
22
use gdk_electrum as electrum;
3+
use gdk_common::error::Error as CommonError;
34

45
#[derive(Debug)]
56
pub enum Error {
67
Other(String),
78
JsonFrom(serde_json::Error),
89
Electrum(electrum::error::Error),
910
Rates(ExchangeRateError),
10-
Common(gdk_common::error::Error),
11+
Common(CommonError),
1112
MethodNotFound {
1213
method: String,
1314
in_session: bool,

subprojects/gdk_rust/tests/test_session.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use electrum_client::ElectrumApi;
88
use elements;
99
use gdk_common::be::{BEAddress, BEBlockHash, BETransaction, BETxid, DUST_VALUE};
1010
use gdk_common::mnemonic::Mnemonic;
11-
use gdk_common::model::*;
11+
use gdk_common::{model::*, wally};
1212
use gdk_common::scripts::ScriptType;
1313
use gdk_common::wally::{asset_blinding_key_from_seed, MasterBlindingKey};
1414
use gdk_common::Network;
@@ -1274,7 +1274,7 @@ impl TestSigner {
12741274
}
12751275
}
12761276
fn seed(&self) -> [u8; 64] {
1277-
gdk_common::wally::bip39_mnemonic_to_seed(&self.mnemonic, "").unwrap()
1277+
wally::bip39_mnemonic_to_seed(&self.mnemonic, "").unwrap()
12781278
}
12791279

12801280
fn master_xprv(&self) -> ExtendedPrivKey {

0 commit comments

Comments
 (0)