gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add helper fn to get last id

Browse Source
This commit is contained in:
Tyera Eulberg
2018-09-22 11:33:06 -06:00
committed by Grimes
parent 7b7e8c0d3f
commit 3ffc7aa5bc
1 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/wallet.rs
View File

@ -363,17 +363,7 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<error::Error
} }
// If client has positive balance, pay tokens to another address // If client has positive balance, pay tokens to another address
WalletCommand::Pay(tokens, to, timestamp, timestamp_pubkey, ref witnesses, cancelable) => { WalletCommand::Pay(tokens, to, timestamp, timestamp_pubkey, ref witnesses, cancelable) => {
let result = WalletRpcRequest::GetLastId.make_rpc_request(&config.rpc_addr, 1, None)?; let last_id = get_last_id(&config)?;
if result.as_str().is_none() {
Err(WalletError::RpcRequestError(
"Received bad last_id".to_string(),
))?
}
let last_id_str = result.as_str().unwrap();
let last_id_vec = bs58::decode(last_id_str)
.into_vec()
.map_err(|_| WalletError::RpcRequestError("Received bad last_id".to_string()))?;
let last_id = Hash::new(&last_id_vec);
let cancelable_bool = cancelable.is_some(); let cancelable_bool = cancelable.is_some();
if timestamp == None && *witnesses == None { if timestamp == None && *witnesses == None {
@ -435,17 +425,7 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<error::Error
} }
// Apply time elapsed to contract // Apply time elapsed to contract
WalletCommand::TimeElapsed(pubkey, dt) => { WalletCommand::TimeElapsed(pubkey, dt) => {
let result = WalletRpcRequest::GetLastId.make_rpc_request(&config.rpc_addr, 1, None)?; let last_id = get_last_id(&config)?;
if result.as_str().is_none() {
Err(WalletError::RpcRequestError(
"Received bad last_id".to_string(),
))?
}
let last_id_str = result.as_str().unwrap();
let last_id_vec = bs58::decode(last_id_str)
.into_vec()
.map_err(|_| WalletError::RpcRequestError("Received bad last_id".to_string()))?;
let last_id = Hash::new(&last_id_vec);
let tx = Transaction::budget_new_timestamp( let tx = Transaction::budget_new_timestamp(
&config.id, &config.id,
@ -472,17 +452,7 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<error::Error
} }
// Apply witness signature to contract // Apply witness signature to contract
WalletCommand::Witness(pubkey) => { WalletCommand::Witness(pubkey) => {
let result = WalletRpcRequest::GetLastId.make_rpc_request(&config.rpc_addr, 1, None)?; let last_id = get_last_id(&config)?;
if result.as_str().is_none() {
Err(WalletError::RpcRequestError(
"Received bad last_id".to_string(),
))?
}
let last_id_str = result.as_str().unwrap();
let last_id_vec = bs58::decode(last_id_str)
.into_vec()
.map_err(|_| WalletError::RpcRequestError("Received bad last_id".to_string()))?;
let last_id = Hash::new(&last_id_vec);
let tx = let tx =
Transaction::budget_new_signature(&config.id, pubkey, config.id.pubkey(), last_id); Transaction::budget_new_signature(&config.id, pubkey, config.id.pubkey(), last_id);
@ -616,6 +586,20 @@ impl WalletRpcRequest {
} }
} }
fn get_last_id(config: &WalletConfig) -> Result<Hash, Box<error::Error>> {
let result = WalletRpcRequest::GetLastId.make_rpc_request(&config.rpc_addr, 1, None)?;
if result.as_str().is_none() {
Err(WalletError::RpcRequestError(
"Received bad last_id".to_string(),
))?
}
let last_id_str = result.as_str().unwrap();
let last_id_vec = bs58::decode(last_id_str)
.into_vec()
.map_err(|_| WalletError::RpcRequestError("Received bad last_id".to_string()))?;
Ok(Hash::new(&last_id_vec))
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;