frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add LibTest getTestDataDir to fix sled test on android

Browse Source
This commit is contained in:
Steve Myers 2021-06-26 18:50:58 -07:00
parent 91ae8dd537
commit 59fe24818a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet.rs
View File

@ -1,3 +1,5 @@
use crate::blockchain::BlockchainConfig;
use crate::database::DatabaseConfig;
use crate::error::get_name; use crate::error::get_name;
use ::safer_ffi::prelude::*; use ::safer_ffi::prelude::*;
use bdk::bitcoin::network::constants::Network::Testnet; use bdk::bitcoin::network::constants::Network::Testnet;
@ -10,8 +12,6 @@ use bdk::wallet::AddressIndex::New;
use bdk::{Error, Wallet}; use bdk::{Error, Wallet};
use safer_ffi::boxed::Box; use safer_ffi::boxed::Box;
use safer_ffi::char_p::{char_p_boxed, char_p_ref}; use safer_ffi::char_p::{char_p_boxed, char_p_ref};
use crate::blockchain::BlockchainConfig;
use crate::database::DatabaseConfig;
#[derive_ReprC] #[derive_ReprC]
#[ReprC::opaque] #[ReprC::opaque]
@ -86,11 +86,10 @@ fn new_wallet_result(
blockchain_config: &BlockchainConfig, blockchain_config: &BlockchainConfig,
database_config: &DatabaseConfig, database_config: &DatabaseConfig,
) -> Box<WalletResult> { ) -> Box<WalletResult> {
let descriptor = descriptor.to_string(); let descriptor = descriptor.to_string();
let change_descriptor = change_descriptor.map(|s| s.to_string()); let change_descriptor = change_descriptor.map(|s| s.to_string());
let bc_config = &blockchain_config.raw; let bc_config = &blockchain_config.raw;
let db_config = &database_config.raw; let db_config = &database_config.raw;
let wallet_result = new_wallet(descriptor, change_descriptor, bc_config, db_config); let wallet_result = new_wallet(descriptor, change_descriptor, bc_config, db_config);
Box::new(WalletResult { raw: wallet_result }) Box::new(WalletResult { raw: wallet_result })
} }