Qortal/piratewallet-light-cli
1
0
Fork 1
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-07-30 20:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-09-30 21:16:33 -07:00
parent 6ffcdd142e
commit 08b5c40273
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lightwallet/mod.rs
View File

@@ -2127,14 +2127,14 @@ pub mod tests {
fn test_z_to_t_withinwallet() { fn test_z_to_t_withinwallet() {
const AMOUNT: u64 = 500000; const AMOUNT: u64 = 500000;
const AMOUNT_SENT: u64 = 20000; const AMOUNT_SENT: u64 = 20000;
let (wallet, config, txid1, block_hash) = get_test_wallet(AMOUNT); let (wallet, txid1, block_hash) = get_test_wallet(AMOUNT);
let taddr = wallet.address_from_sk(&wallet.tkeys[0]); let taddr = wallet.address_from_sk(&wallet.tkeys[0]);
let fee: u64 = DEFAULT_FEE.try_into().unwrap(); let fee: u64 = DEFAULT_FEE.try_into().unwrap();
let branch_id = u32::from_str_radix("2bb40e60", 16).unwrap(); let branch_id = u32::from_str_radix("2bb40e60", 16).unwrap();
let (ss, so) = get_sapling_params(&config).unwrap(); let (ss, so) = get_sapling_params().unwrap();
// Create a tx and send to address // Create a tx and send to address
let raw_tx = wallet.send_to_address(branch_id, &ss, &so, let raw_tx = wallet.send_to_address(branch_id, &ss, &so,
@@ -2184,7 +2184,7 @@ pub mod tests {
fn test_rollback() { fn test_rollback() {
const AMOUNT: u64 = 500000; const AMOUNT: u64 = 500000;
let (wallet, config, txid1, block_hash) = get_test_wallet(AMOUNT); let (wallet, txid1, block_hash) = get_test_wallet(AMOUNT);
let add_blocks = |start: i32, num: i32, mut prev_hash: BlockHash| { let add_blocks = |start: i32, num: i32, mut prev_hash: BlockHash| {
// Add it to a block // Add it to a block
@@ -2231,7 +2231,7 @@ pub mod tests {
let taddr = wallet.address_from_sk(&SecretKey::from_slice(&[1u8; 32]).unwrap()); let taddr = wallet.address_from_sk(&SecretKey::from_slice(&[1u8; 32]).unwrap());
let branch_id = u32::from_str_radix("2bb40e60", 16).unwrap(); let branch_id = u32::from_str_radix("2bb40e60", 16).unwrap();
let (ss, so) = get_sapling_params(&config).unwrap(); let (ss, so) = get_sapling_params().unwrap();
// Create a tx and send to address // Create a tx and send to address
const AMOUNT_SENT: u64 = 30000; const AMOUNT_SENT: u64 = 30000;