clean up

input-output-hk · Jul 1, 2020 · cf4d303 · cf4d303
1 parent 2809a35
commit cf4d303
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/testing/jormungandr-integration-tests/src/common/configuration/node_config_builder.rs b/testing/jormungandr-integration-tests/src/common/configuration/node_config_builder.rs
@@ -4,8 +4,7 @@ use std::path::PathBuf;
 
 use jormungandr_lib::{
     interfaces::{
-        Explorer, Log, LogEntry, LogOutput, Mempool, NodeConfig, P2p, Policy, Rest, Tls,
-        TopicsOfInterest, TrustedPeer,
+        Explorer, Log, Mempool, NodeConfig, P2p, Policy, Rest, Tls, TopicsOfInterest, TrustedPeer,
     },
     time::Duration,
 };

diff --git a/testing/jormungandr-integration-tests/src/common/jormungandr/configuration_builder.rs b/testing/jormungandr-integration-tests/src/common/jormungandr/configuration_builder.rs
@@ -11,9 +11,9 @@ use chain_crypto::Ed25519;
 use chain_impl_mockchain::{chaintypes::ConsensusVersion, fee::LinearFee};
 use jormungandr_lib::crypto::key::KeyPair;
 use jormungandr_lib::interfaces::{
-    ActiveSlotCoefficient, Block0Configuration, ConsensusLeaderId, EpochStabilityDepth, Initial,
-    InitialUTxO, KESUpdateSpeed, Log, Mempool, NumberOfSlotsPerEpoch, Policy, SignedCertificate,
-    SlotDuration, Tls, TrustedPeer,
+    ActiveSlotCoefficient, CommitteeIdDef, ConsensusLeaderId, EpochStabilityDepth, Initial,
+    InitialUTxO, KESUpdateSpeed, Log, LogEntry, LogOutput, Mempool, NodeConfig, NodeSecret,
+    NumberOfSlotsPerEpoch, Policy, SignedCertificate, SlotDuration, Tls, TrustedPeer,
 };
 
 use assert_fs::fixture::{ChildPath, PathChild};
@@ -127,8 +127,9 @@ impl ConfigurationBuilder {
         self
     }
 
-    pub fn with_storage(&mut self, path: PathBuf) -> &mut Self {
-        self.node_config_builder.with_storage(path);
+    pub fn with_storage(&mut self, temp_dir: &ChildPath) -> &mut Self {
+        self.node_config_builder
+            .with_storage(temp_dir.path().into());
         self
     }
 

diff --git a/testing/jormungandr-testing-utils/src/testing/fragments/adversary.rs b/testing/jormungandr-testing-utils/src/testing/fragments/adversary.rs
@@ -1,24 +1,19 @@
 use super::{FragmentBuilderError, FragmentExporter, FragmentExporterError};
 use crate::{
-    stake_pool::StakePool,
     testing::{
         ensure_node_is_in_sync_with_others,
         fragments::node::{FragmentNode, MemPoolCheck},
-        FragmentSenderSetup, FragmentVerifier, SyncNode, SyncNodeError, SyncWaitParams,
+        FragmentVerifier, SyncNode, SyncNodeError, SyncWaitParams,
     },
     wallet::Wallet,
 };
 use chain_core::property::Fragment as _;
 use chain_impl_mockchain::{
-    account::DelegationType,
-    certificate::{Certificate, PoolId, StakeDelegation},
+    certificate::{Certificate, PoolId},
     fee::LinearFee,
     fragment::Fragment,
     testing::{build_owner_stake_full_delegation, FaultTolerantTxCertBuilder, TestGen},
-    transaction::{
-        Input, InputOutput, InputOutputBuilder, NoExtra, Output, TransactionSignDataHash,
-        TxBuilder, UnspecifiedAccountIdentifier, Witness,
-    },
+    transaction::{Input, Output, TransactionSignDataHash, TxBuilder, Witness},
 };
 use chain_impl_mockchain::{fee::FeeAlgorithm, ledger::OutputAddress, value::Value};
 use jormungandr_lib::{