重构代码
This commit is contained in:
parent
6a54cc5f4f
commit
16bf534ceb
@ -110,19 +110,13 @@ impl Wallet {
|
|||||||
let key_str_0: &str = &self.master_key;
|
let key_str_0: &str = &self.master_key;
|
||||||
let key0 = BigInt::parse_bytes(&key_str_0.as_bytes(), 16).unwrap();
|
let key0 = BigInt::parse_bytes(&key_str_0.as_bytes(), 16).unwrap();
|
||||||
let kp0: (usize, BigInt) = (1, key0);
|
let kp0: (usize, BigInt) = (1, key0);
|
||||||
let i: usize;
|
let (i, key_str_1) = match (&self.second_key, &self.backup_key) {
|
||||||
let key_str_1: &str;
|
(Some(val), _) => (2, val),
|
||||||
if let Some(val) = &self.second_key {
|
(_, Some(val)) => (3, val),
|
||||||
i = 2;
|
_ => {
|
||||||
key_str_1 = val;
|
panic!("error generate key")
|
||||||
} else if let Some(val) = &self.backup_key {
|
}
|
||||||
i = 3;
|
};
|
||||||
key_str_1 = val;
|
|
||||||
} else {
|
|
||||||
println!("error");
|
|
||||||
i = 2;
|
|
||||||
key_str_1 = "";
|
|
||||||
}
|
|
||||||
let key1 = BigInt::parse_bytes(&key_str_1.as_bytes(), 16).unwrap();
|
let key1 = BigInt::parse_bytes(&key_str_1.as_bytes(), 16).unwrap();
|
||||||
let kp1 = (i, key1);
|
let kp1 = (i, key1);
|
||||||
let _tmp = vec![kp0, kp1];
|
let _tmp = vec![kp0, kp1];
|
||||||
@ -172,6 +166,7 @@ impl Wallet {
|
|||||||
write!(s, "{:02x}", rv).unwrap();
|
write!(s, "{:02x}", rv).unwrap();
|
||||||
Ok(s)
|
Ok(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn sign_for_tran<S>(&self, msg: S) -> Result<(String, i32)>
|
pub fn sign_for_tran<S>(&self, msg: S) -> Result<(String, i32)>
|
||||||
where
|
where
|
||||||
S: AsRef<[u8]>,
|
S: AsRef<[u8]>,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user