zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Trivial rename.

This commit is contained in:
Kris Nuttycombe 2021-01-12 21:32:23 -07:00
parent 1a0301d122
commit 6c6b05fa9b
6 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zcash_client_backend/src/data_api/chain.rs
View File

@ -117,12 +117,14 @@ where
/// use zcash_client_sqlite::{
/// BlockDB,
/// WalletDB,
/// wallet::init::init_wallet_db,
/// };
///
/// let cache_file = NamedTempFile::new().unwrap();
/// let cache = BlockDB::for_path(cache_file).unwrap();
/// let data_file = NamedTempFile::new().unwrap();
/// let db_read = WalletDB::for_path(data_file, Network::TestNetwork).unwrap();
/// init_wallet_db(&db_read).unwrap();
/// let mut data = db_read.get_update_ops().unwrap();
/// scan_cached_blocks(&Network::TestNetwork, &cache, &mut data, None);
/// ```

2
zcash_client_backend/src/data_api/wallet.rs
View File

@ -111,6 +111,7 @@ where
/// };
/// use zcash_client_sqlite::{
/// WalletDB,
/// wallet::init::init_wallet_db,
/// };
///
/// let tx_prover = match LocalTxProver::with_default_location() {
@ -126,6 +127,7 @@ where
///
/// let data_file = NamedTempFile::new().unwrap();
/// let db_read = WalletDB::for_path(data_file, Network::TestNetwork).unwrap();
/// init_wallet_db(&db_read).unwrap();
/// let mut db = db_read.get_update_ops().unwrap();
/// match create_spend_to_address(
/// &mut db,

20
zcash_client_sqlite/src/chain.rs
View File

@ -23,7 +23,7 @@
//! BlockDB,
//! WalletDB,
//! wallet::{rewind_to_height},
//! wallet::init::{init_data_database},
//! wallet::init::{init_wallet_db},
//! };
//!
//! let network = Network::TestNetwork;
@ -31,7 +31,7 @@
//! let db_cache = BlockDB::for_path(cache_file).unwrap();
//! let db_file = NamedTempFile::new().unwrap();
//! let db_read = WalletDB::for_path(db_file, network).unwrap();
//! init_data_database(&db_read).unwrap();
//! init_wallet_db(&db_read).unwrap();
//!
//! let mut db_data = db_read.get_update_ops().unwrap();
//!
@ -169,7 +169,7 @@ mod tests {
},
wallet::{
get_balance,
init::{init_accounts_table, init_data_database},
init::{init_accounts_table, init_wallet_db},
rewind_to_height,
},
AccountId, BlockDB, NoteId, WalletDB,
@ -183,7 +183,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -264,7 +264,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -336,7 +336,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -408,7 +408,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -467,7 +467,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -532,7 +532,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -580,7 +580,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);

4
zcash_client_sqlite/src/wallet.rs
View File

@ -696,7 +696,7 @@ mod tests {
use crate::{
tests,
wallet::init::{init_accounts_table, init_data_database},
wallet::init::{init_accounts_table, init_wallet_db},
AccountId, WalletDB,
};
@ -706,7 +706,7 @@ mod tests {
fn empty_database_has_no_balance() {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);

18
zcash_client_sqlite/src/wallet/init.rs
View File

@ -21,14 +21,14 @@ use crate::{address_from_extfvk, error::SqliteClientError, WalletDB};
/// use zcash_primitives::consensus::Network;
/// use zcash_client_sqlite::{
/// WalletDB,
/// wallet::init::init_data_database,
/// wallet::init::init_wallet_db,
/// };
///
/// let data_file = NamedTempFile::new().unwrap();
/// let db = WalletDB::for_path(data_file.path(), Network::TestNetwork).unwrap();
/// init_data_database(&db).unwrap();
/// init_wallet_db(&db).unwrap();
/// ```
pub fn init_data_database<P>(wdb: &WalletDB<P>) -> Result<(), rusqlite::Error> {
pub fn init_wallet_db<P>(wdb: &WalletDB<P>) -> Result<(), rusqlite::Error> {
wdb.conn.execute(
"CREATE TABLE IF NOT EXISTS accounts (
account INTEGER PRIMARY KEY,
@ -128,12 +128,12 @@ pub fn init_data_database<P>(wdb: &WalletDB<P>) -> Result<(), rusqlite::Error> {
///
/// use zcash_client_sqlite::{
/// WalletDB,
/// wallet::init::{init_accounts_table, init_data_database}
/// wallet::init::{init_accounts_table, init_wallet_db}
/// };
///
/// let data_file = NamedTempFile::new().unwrap();
/// let db_data = WalletDB::for_path(data_file.path(), Network::TestNetwork).unwrap();
/// init_data_database(&db_data).unwrap();
/// init_wallet_db(&db_data).unwrap();
///
/// let extsk = ExtendedSpendingKey::master(&[]);
/// let extfvks = [ExtendedFullViewingKey::from(&extsk)];
@ -247,13 +247,13 @@ mod tests {
use crate::{tests, wallet::get_address, AccountId, WalletDB};
use super::{init_accounts_table, init_blocks_table, init_data_database};
use super::{init_accounts_table, init_blocks_table, init_wallet_db};
#[test]
fn init_accounts_table_only_works_once() {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// We can call the function as many times as we want with no data
init_accounts_table(&db_data, &[]).unwrap();
@ -274,7 +274,7 @@ mod tests {
fn init_blocks_table_only_works_once() {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// First call with data should initialise the blocks table
init_blocks_table(
@ -301,7 +301,7 @@ mod tests {
fn init_accounts_table_stores_correct_address() {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);

14
zcash_client_sqlite/src/wallet/transact.rs
View File

@ -172,7 +172,7 @@ mod tests {
tests::{self, fake_compact_block, insert_into_cache, sapling_activation_height},
wallet::{
get_balance, get_verified_balance,
init::{init_accounts_table, init_blocks_table, init_data_database},
init::{init_accounts_table, init_blocks_table, init_wallet_db},
},
AccountId, BlockDB, DataConnStmtCache, WalletDB,
};
@ -190,7 +190,7 @@ mod tests {
fn create_to_address_fails_on_incorrect_extsk() {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add two accounts to the wallet
let extsk0 = ExtendedSpendingKey::master(&[]);
@ -239,7 +239,7 @@ mod tests {
fn create_to_address_fails_with_no_blocks() {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -269,7 +269,7 @@ mod tests {
fn create_to_address_fails_on_insufficient_balance() {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
init_blocks_table(
&db_data,
BlockHeight::from(1u32),
@ -317,7 +317,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -448,7 +448,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), tests::network()).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);
@ -569,7 +569,7 @@ mod tests {
let data_file = NamedTempFile::new().unwrap();
let db_data = WalletDB::for_path(data_file.path(), network).unwrap();
init_data_database(&db_data).unwrap();
init_wallet_db(&db_data).unwrap();
// Add an account to the wallet
let extsk = ExtendedSpendingKey::master(&[]);