cargo fix --edition for zcash_primitives

This commit is contained in:
Eirik Ogilvie-Wigley
2019-08-20 17:15:07 -06:00
parent e12d315ab9
commit b0d8747697
15 changed files with 31 additions and 31 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ use crate::{
use ff::Field;
use pairing::bls12_381::{Bls12, Fr};
use rand::{rngs::OsRng, seq::SliceRandom, CryptoRng, RngCore};
use zip32::ExtendedSpendingKey;
use crate::zip32::ExtendedSpendingKey;
use crate::{
keys::OutgoingViewingKey,
@@ -4,9 +4,9 @@ use ff::{PrimeField, PrimeFieldRepr};
use pairing::bls12_381::{Bls12, Fr, FrRepr};
use std::io::{self, Read, Write};
use legacy::Script;
use redjubjub::{PublicKey, Signature};
use JUBJUB;
use crate::legacy::Script;
use crate::redjubjub::{PublicKey, Signature};
use crate::JUBJUB;
pub mod amount;
pub use self::amount::Amount;
+2 -2
View File
@@ -5,8 +5,8 @@ use std::fmt;
use std::io::{self, Read, Write};
use std::ops::Deref;
use redjubjub::Signature;
use serialize::Vector;
use crate::redjubjub::Signature;
use crate::serialize::Vector;
pub mod builder;
pub mod components;
+1 -1
View File
@@ -7,7 +7,7 @@ use super::{
Transaction, TransactionData, OVERWINTER_VERSION_GROUP_ID, SAPLING_TX_VERSION,
SAPLING_VERSION_GROUP_ID,
};
use legacy::Script;
use crate::legacy::Script;
const ZCASH_SIGHASH_PERSONALIZATION_PREFIX: &'static [u8; 12] = b"ZcashSigHash";
const ZCASH_PREVOUTS_HASH_PERSONALIZATION: &'static [u8; 16] = b"ZcashPrevoutHash";
+3 -3
View File
@@ -5,9 +5,9 @@ use rand_os::OsRng;
use crate::jubjub::{fs::Fs, FixedGenerators};
use super::{components::Amount, sighash::signature_hash, Transaction, TransactionData};
use legacy::Script;
use redjubjub::PrivateKey;
use JUBJUB;
use crate::legacy::Script;
use crate::redjubjub::PrivateKey;
use crate::JUBJUB;
#[test]
fn tx_read_write() {