Skip to content

Commit 11b1355

Browse files
committed
fix: keystore json err message
1 parent ffec5e2 commit 11b1355

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

adapter/src/ethereum.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ use web3::{
2323
};
2424

2525
lazy_static! {
26-
static ref ADEXCORE_ABI: &'static [u8] = include_bytes!("../../lib/protocol-eth/abi/AdExCore.json");
27-
static ref IDENTITY_ABI: &'static [u8] = include_bytes!("../../lib/protocol-eth/abi/Identity.json");
26+
static ref ADEXCORE_ABI: &'static [u8] =
27+
include_bytes!("../../lib/protocol-eth/abi/AdExCore.json");
28+
static ref IDENTITY_ABI: &'static [u8] =
29+
include_bytes!("../../lib/protocol-eth/abi/Identity.json");
2830
}
2931

3032
#[derive(Debug, Clone)]
@@ -70,7 +72,7 @@ impl Adapter for EthereumAdapter {
7072

7173
let account = SafeAccount::from_file(
7274
serde_json::from_reader(json_file)
73-
.map_err(|_| map_error("Invalid keystore location provided"))?,
75+
.map_err(|_| map_error("Invalid keystore json provided"))?,
7476
None,
7577
&Some(self.keystore_pwd.clone()),
7678
)

primitives/src/adapter.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pub enum AdapterError {
1515
Configuration(String),
1616
Signature(String),
1717
InvalidChannel(String),
18-
IO(String),
1918
Failed(String),
2019
}
2120

@@ -30,8 +29,7 @@ impl fmt::Display for AdapterError {
3029
AdapterError::Configuration(error) => write!(f, "Configuration error: {}", error),
3130
AdapterError::Signature(error) => write!(f, "Signature error: {}", error),
3231
AdapterError::InvalidChannel(error) => write!(f, "Invalid Channel error: {}", error),
33-
AdapterError::IO(error) => write!(f, "IO error: {}", error),
34-
AdapterError::Failed(error) => write!(f, "IO error: {}", error),
32+
AdapterError::Failed(error) => write!(f, "error: {}", error),
3533
}
3634
}
3735
}

0 commit comments

Comments
 (0)