Rustfmt
This commit is contained in:
parent
80e1d35ea6
commit
cfb6850d7c
|
@ -4,11 +4,7 @@ use zcash_client_backend::encoding::{
|
||||||
decode_payment_address, decode_transparent_address, encode_payment_address,
|
decode_payment_address, decode_transparent_address, encode_payment_address,
|
||||||
encode_transparent_address,
|
encode_transparent_address,
|
||||||
};
|
};
|
||||||
use zcash_primitives::{
|
use zcash_primitives::{consensus, legacy::TransparentAddress, primitives::PaymentAddress};
|
||||||
consensus,
|
|
||||||
legacy::TransparentAddress,
|
|
||||||
primitives::PaymentAddress,
|
|
||||||
};
|
|
||||||
|
|
||||||
/// An address that funds can be sent to.
|
/// An address that funds can be sent to.
|
||||||
pub enum RecipientAddress {
|
pub enum RecipientAddress {
|
||||||
|
|
|
@ -4,11 +4,7 @@ use rusqlite::{types::ToSql, Connection, NO_PARAMS};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use zcash_client_backend::encoding::encode_extended_full_viewing_key;
|
use zcash_client_backend::encoding::encode_extended_full_viewing_key;
|
||||||
|
|
||||||
use zcash_primitives::{
|
use zcash_primitives::{block::BlockHash, consensus, zip32::ExtendedFullViewingKey};
|
||||||
block::BlockHash,
|
|
||||||
consensus,
|
|
||||||
zip32::ExtendedFullViewingKey,
|
|
||||||
};
|
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
address_from_extfvk,
|
address_from_extfvk,
|
||||||
|
@ -259,10 +255,7 @@ mod tests {
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::{init_accounts_table, init_blocks_table, init_data_database};
|
use super::{init_accounts_table, init_blocks_table, init_data_database};
|
||||||
use crate::{
|
use crate::{query::get_address, tests};
|
||||||
query::get_address,
|
|
||||||
tests,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn init_accounts_table_only_works_once() {
|
fn init_accounts_table_only_works_once() {
|
||||||
|
|
|
@ -127,7 +127,7 @@ pub trait Parameters: Clone {
|
||||||
/// if an activation height has been set.
|
/// if an activation height has been set.
|
||||||
fn activation_height(&self, nu: NetworkUpgrade) -> Option<BlockHeight>;
|
fn activation_height(&self, nu: NetworkUpgrade) -> Option<BlockHeight>;
|
||||||
|
|
||||||
/// Returns the human-readable prefix for Sapling extended full
|
/// Returns the human-readable prefix for Sapling extended full
|
||||||
/// viewing keys for the network to which this Parameters value applies.
|
/// viewing keys for the network to which this Parameters value applies.
|
||||||
fn hrp_sapling_extended_full_viewing_key(&self) -> &str;
|
fn hrp_sapling_extended_full_viewing_key(&self) -> &str;
|
||||||
|
|
||||||
|
@ -135,7 +135,7 @@ pub trait Parameters: Clone {
|
||||||
/// viewing keys for the network to which this Parameters value applies.
|
/// viewing keys for the network to which this Parameters value applies.
|
||||||
fn hrp_sapling_payment_address(&self) -> &str;
|
fn hrp_sapling_payment_address(&self) -> &str;
|
||||||
|
|
||||||
/// Returns the human-readable prefix for transparent pay-to-public-key-hash
|
/// Returns the human-readable prefix for transparent pay-to-public-key-hash
|
||||||
/// payment addresses for the network to which this Parameters value applies.
|
/// payment addresses for the network to which this Parameters value applies.
|
||||||
fn b58_pubkey_address_prefix(&self) -> [u8; 2];
|
fn b58_pubkey_address_prefix(&self) -> [u8; 2];
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ pub trait Parameters: Clone {
|
||||||
/// payment addresses for the network to which this Parameters value applies.
|
/// payment addresses for the network to which this Parameters value applies.
|
||||||
fn b58_script_address_prefix(&self) -> [u8; 2];
|
fn b58_script_address_prefix(&self) -> [u8; 2];
|
||||||
|
|
||||||
/// Determines whether the specified network upgrade is active as of the
|
/// Determines whether the specified network upgrade is active as of the
|
||||||
/// provided block height on the network to which this Parameters value applies.
|
/// provided block height on the network to which this Parameters value applies.
|
||||||
fn is_nu_active(&self, nu: NetworkUpgrade, height: BlockHeight) -> bool {
|
fn is_nu_active(&self, nu: NetworkUpgrade, height: BlockHeight) -> bool {
|
||||||
self.activation_height(nu).map_or(false, |h| h <= height)
|
self.activation_height(nu).map_or(false, |h| h <= height)
|
||||||
|
|
Loading…
Reference in New Issue