From 2ace597da1cde25e483ca26565571c12654f1ba7 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 7 Apr 2021 18:08:02 +1000 Subject: [PATCH] Clean up use statements in `arbitrary` modules (#1984) * Clean up use statements in `arbitrary` modules Co-authored-by: Deirdre Connolly --- zebra-chain/src/block/arbitrary.rs | 20 +++++++++++--------- zebra-chain/src/transaction/arbitrary.rs | 3 +-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/zebra-chain/src/block/arbitrary.rs b/zebra-chain/src/block/arbitrary.rs index a9993a51..cb269574 100644 --- a/zebra-chain/src/block/arbitrary.rs +++ b/zebra-chain/src/block/arbitrary.rs @@ -1,17 +1,19 @@ -use std::sync::Arc; - -use crate::parameters::Network; -use crate::work::{difficulty::CompactDifficulty, equihash}; - -use super::*; - -use crate::LedgerState; -use chrono::{TimeZone, Utc}; use proptest::{ arbitrary::{any, Arbitrary}, prelude::*, }; +use chrono::{TimeZone, Utc}; +use std::sync::Arc; + +use crate::{ + parameters::Network, + work::{difficulty::CompactDifficulty, equihash}, + LedgerState, +}; + +use super::*; + impl Arbitrary for Block { type Parameters = LedgerState; diff --git a/zebra-chain/src/transaction/arbitrary.rs b/zebra-chain/src/transaction/arbitrary.rs index d568740c..9afb0558 100644 --- a/zebra-chain/src/transaction/arbitrary.rs +++ b/zebra-chain/src/transaction/arbitrary.rs @@ -1,6 +1,5 @@ use std::sync::Arc; -use block::Height; use chrono::{TimeZone, Utc}; use futures::future::Either; use proptest::{arbitrary::any, array, collection::vec, option, prelude::*}; @@ -247,7 +246,7 @@ impl Arbitrary for Transaction { .. } = ledger_state; - let height = Height(tip_height.0 + 1); + let height = block::Height(tip_height.0 + 1); let network_upgrade = NetworkUpgrade::current(network, height); match network_upgrade {