From 41d092a16911f9688c41acdd608ec645a6e98dc8 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Mon, 11 Jul 2016 16:30:37 +0200 Subject: [PATCH] Minor: optimize imports --- contracts/isolated/build.gradle | 3 ++- .../core/node/DummyContractBackdoor.kt | 2 +- .../contracts/ICommercialPaperState.java | 7 ++--- .../contracts/JavaCommercialPaper.java | 26 +++++++------------ .../r3corda/contracts/asset/FungibleAsset.kt | 4 --- .../contracts/asset/FungibleAssetState.kt | 1 - .../contracts/asset/CashTestsJava.java | 10 +++---- .../contracts/asset/ObligationTests.kt | 6 +++-- .../core/node/services/NetworkMapCache.kt | 1 - .../r3corda/core/testing/DummyLinearState.kt | 1 - .../r3corda/protocols/FetchDataProtocol.kt | 2 ++ .../com/r3corda/protocols/RatesFixProtocol.kt | 1 + .../AbstractStateReplacementProtocol.kt | 2 ++ .../kotlin/protocols/NotaryChangeProtocol.kt | 2 ++ .../ProtocolLogicRefFromJavaTest.java | 9 +++---- .../contracts/TransactionGraphSearchTests.kt | 1 - .../core/contracts/TransactionGroupTests.kt | 1 - .../com/r3corda/core/crypto/Base58Test.kt | 4 +-- .../TransactionSerializationTests.kt | 1 - .../com/r3corda/node/internal/AbstractNode.kt | 3 --- .../kotlin/com/r3corda/node/internal/Node.kt | 2 -- .../network/InMemoryMessagingNetwork.kt | 1 + .../persistence/NodeAttachmentService.kt | 8 ++---- .../persistence/StorageServiceImpl.kt | 1 - .../node/servlets/DataUploadServlet.kt | 4 +-- .../node/utilities/ANSIProgressRenderer.kt | 1 + .../node/messaging/InMemoryMessagingTests.kt | 2 -- .../services/NodeAttachmentStorageTest.kt | 6 +---- .../node/services/WalletWithCashTest.kt | 2 +- .../node/visualiser/GroupToGraphConversion.kt | 4 ++- 30 files changed, 47 insertions(+), 71 deletions(-) diff --git a/contracts/isolated/build.gradle b/contracts/isolated/build.gradle index 37df6202ee..d9d9f852e4 100644 --- a/contracts/isolated/build.gradle +++ b/contracts/isolated/build.gradle @@ -1,11 +1,12 @@ import com.google.common.io.ByteStreams + import java.nio.file.Files import java.nio.file.Paths import java.nio.file.StandardCopyOption import java.nio.file.attribute.FileTime import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream import java.util.zip.ZipFile +import java.util.zip.ZipOutputStream buildscript { repositories { diff --git a/contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt b/contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt index a01d417df3..b54b87eb64 100644 --- a/contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt +++ b/contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt @@ -1,9 +1,9 @@ package com.r3corda.core.node import com.r3corda.core.contracts.ContractState -import com.r3corda.core.crypto.Party import com.r3corda.core.contracts.PartyAndReference import com.r3corda.core.contracts.TransactionBuilder +import com.r3corda.core.crypto.Party interface DummyContractBackdoor { fun generateInitial(owner: PartyAndReference, magicNumber: Int, notary: Party): TransactionBuilder diff --git a/contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java b/contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java index 40ffce6315..778dbd4a6f 100644 --- a/contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java +++ b/contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java @@ -1,13 +1,10 @@ package com.r3corda.contracts; -import com.r3corda.core.contracts.Amount; -import com.r3corda.core.contracts.ContractState; -import com.r3corda.core.contracts.PartyAndReference; -import com.r3corda.core.contracts.Issued; +import com.r3corda.core.contracts.*; import java.security.*; import java.time.*; -import java.util.Currency; +import java.util.*; /* This is an interface solely created to demonstrate that the same kotlin tests can be run against * either a Java implementation of the CommercialPaper or a kotlin implementation. diff --git a/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java b/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java index ec7ab3a1c7..c70d06bdd0 100644 --- a/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java +++ b/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java @@ -1,24 +1,18 @@ package com.r3corda.contracts; -import com.google.common.collect.ImmutableList; -import com.r3corda.contracts.asset.Cash; -import com.r3corda.contracts.asset.CashKt; -import com.r3corda.contracts.asset.InsufficientBalanceException; +import com.google.common.collect.*; +import com.r3corda.contracts.asset.*; import com.r3corda.core.contracts.*; -import com.r3corda.core.contracts.TransactionForContract.InOutGroup; -import com.r3corda.core.crypto.NullPublicKey; -import com.r3corda.core.crypto.Party; -import com.r3corda.core.crypto.SecureHash; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import com.r3corda.core.contracts.TransactionForContract.*; +import com.r3corda.core.crypto.*; +import org.jetbrains.annotations.*; -import java.security.PublicKey; -import java.time.Instant; -import java.util.Currency; -import java.util.List; +import java.security.*; +import java.time.*; +import java.util.*; -import static com.r3corda.core.contracts.ContractsDSL.requireSingleCommand; -import static kotlin.collections.CollectionsKt.single; +import static com.r3corda.core.contracts.ContractsDSL.*; +import static kotlin.collections.CollectionsKt.*; /** diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAsset.kt b/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAsset.kt index 60a2638789..c935db7594 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAsset.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAsset.kt @@ -2,11 +2,7 @@ package com.r3corda.contracts.asset import com.r3corda.core.contracts.* import com.r3corda.core.crypto.Party -import com.r3corda.core.crypto.SecureHash -import com.r3corda.core.crypto.toStringShort -import com.r3corda.core.utilities.Emoji import java.security.PublicKey -import java.security.SecureRandom import java.util.* ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAssetState.kt b/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAssetState.kt index 436919b690..452ed85af5 100644 --- a/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAssetState.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/asset/FungibleAssetState.kt @@ -1,7 +1,6 @@ package com.r3corda.contracts.asset import com.r3corda.core.contracts.Amount -import com.r3corda.core.contracts.Issued import com.r3corda.core.contracts.OwnableState import java.security.PublicKey diff --git a/contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java b/contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java index 0250935477..55c5fed4e3 100644 --- a/contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java +++ b/contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java @@ -1,12 +1,12 @@ package com.r3corda.contracts.asset; -import com.r3corda.core.contracts.PartyAndReference; -import com.r3corda.core.serialization.OpaqueBytes; -import kotlin.Unit; -import org.junit.Test; +import com.r3corda.core.contracts.*; +import com.r3corda.core.serialization.*; +import kotlin.*; +import org.junit.*; -import static com.r3corda.core.testing.CoreTestUtils.*; import static com.r3corda.core.contracts.ContractsDSL.*; +import static com.r3corda.core.testing.CoreTestUtils.*; /** * This is an incomplete Java replica of CashTests.kt to show how to use the Java test DSL diff --git a/contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt index a37c250c6d..b69754004e 100644 --- a/contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt +++ b/contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt @@ -1,7 +1,6 @@ package com.r3corda.contracts.asset import com.r3corda.contracts.asset.Obligation.Lifecycle -import com.r3corda.contracts.testing.* import com.r3corda.core.contracts.* import com.r3corda.core.crypto.SecureHash import com.r3corda.core.testing.* @@ -11,7 +10,10 @@ import java.security.PublicKey import java.time.Duration import java.time.Instant import java.util.* -import kotlin.test.* +import kotlin.test.assertEquals +import kotlin.test.assertFailsWith +import kotlin.test.assertNotEquals +import kotlin.test.assertTrue class ObligationTests { val defaultIssuer = MEGA_CORP.ref(1) diff --git a/core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt b/core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt index fa86c2669c..5ffa78ae11 100644 --- a/core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt @@ -5,7 +5,6 @@ import com.r3corda.core.contracts.Contract import com.r3corda.core.crypto.Party import com.r3corda.core.messaging.MessagingService import com.r3corda.core.node.NodeInfo -import com.r3corda.core.node.services.ServiceType import org.slf4j.LoggerFactory import java.security.PublicKey diff --git a/core/src/main/kotlin/com/r3corda/core/testing/DummyLinearState.kt b/core/src/main/kotlin/com/r3corda/core/testing/DummyLinearState.kt index 756e1c4494..4868efcb59 100644 --- a/core/src/main/kotlin/com/r3corda/core/testing/DummyLinearState.kt +++ b/core/src/main/kotlin/com/r3corda/core/testing/DummyLinearState.kt @@ -4,7 +4,6 @@ import com.r3corda.core.contracts.Contract import com.r3corda.core.contracts.LinearState import com.r3corda.core.crypto.SecureHash import java.security.PublicKey -import java.util.* class DummyLinearState( override val thread: SecureHash = SecureHash.randomSHA256(), diff --git a/core/src/main/kotlin/com/r3corda/protocols/FetchDataProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/FetchDataProtocol.kt index f72aafbeb9..48197eb970 100644 --- a/core/src/main/kotlin/com/r3corda/protocols/FetchDataProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/FetchDataProtocol.kt @@ -7,6 +7,8 @@ import com.r3corda.core.crypto.SecureHash import com.r3corda.core.protocols.ProtocolLogic import com.r3corda.core.random63BitValue import com.r3corda.core.utilities.UntrustworthyData +import com.r3corda.protocols.FetchDataProtocol.DownloadedVsRequestedDataMismatch +import com.r3corda.protocols.FetchDataProtocol.HashNotFound import java.util.* /** diff --git a/core/src/main/kotlin/com/r3corda/protocols/RatesFixProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/RatesFixProtocol.kt index d61ad3d968..048f1a8767 100644 --- a/core/src/main/kotlin/com/r3corda/protocols/RatesFixProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/RatesFixProtocol.kt @@ -11,6 +11,7 @@ import com.r3corda.core.protocols.ProtocolLogic import com.r3corda.core.random63BitValue import com.r3corda.core.utilities.ProgressTracker import com.r3corda.core.utilities.suggestInterestRateAnnouncementTimeWindow +import com.r3corda.protocols.RatesFixProtocol.FixOutOfRange import java.math.BigDecimal import java.time.Duration import java.time.Instant diff --git a/core/src/main/kotlin/protocols/AbstractStateReplacementProtocol.kt b/core/src/main/kotlin/protocols/AbstractStateReplacementProtocol.kt index 1aafd6fed8..1ae3e98408 100644 --- a/core/src/main/kotlin/protocols/AbstractStateReplacementProtocol.kt +++ b/core/src/main/kotlin/protocols/AbstractStateReplacementProtocol.kt @@ -13,6 +13,8 @@ import com.r3corda.core.utilities.ProgressTracker import com.r3corda.protocols.NotaryProtocol import com.r3corda.protocols.PartyRequestMessage import com.r3corda.protocols.ResolveTransactionsProtocol +import protocols.AbstractStateReplacementProtocol.Acceptor +import protocols.AbstractStateReplacementProtocol.Instigator import java.security.PublicKey /** diff --git a/core/src/main/kotlin/protocols/NotaryChangeProtocol.kt b/core/src/main/kotlin/protocols/NotaryChangeProtocol.kt index 7ec371acc4..b0f6d13456 100644 --- a/core/src/main/kotlin/protocols/NotaryChangeProtocol.kt +++ b/core/src/main/kotlin/protocols/NotaryChangeProtocol.kt @@ -4,6 +4,8 @@ import co.paralleluniverse.fibers.Suspendable import com.r3corda.core.contracts.* import com.r3corda.core.crypto.Party import com.r3corda.core.utilities.ProgressTracker +import protocols.NotaryChangeProtocol.Acceptor +import protocols.NotaryChangeProtocol.Instigator import java.security.PublicKey /** diff --git a/core/src/test/java/com/r3corda/core/protocols/ProtocolLogicRefFromJavaTest.java b/core/src/test/java/com/r3corda/core/protocols/ProtocolLogicRefFromJavaTest.java index b17b1fde80..3af28e217f 100644 --- a/core/src/test/java/com/r3corda/core/protocols/ProtocolLogicRefFromJavaTest.java +++ b/core/src/test/java/com/r3corda/core/protocols/ProtocolLogicRefFromJavaTest.java @@ -1,13 +1,10 @@ package com.r3corda.core.protocols; -import org.jetbrains.annotations.NotNull; -import org.junit.Test; +import org.jetbrains.annotations.*; +import org.junit.*; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; public class ProtocolLogicRefFromJavaTest { diff --git a/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGraphSearchTests.kt b/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGraphSearchTests.kt index a6630302f3..e181996ce0 100644 --- a/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGraphSearchTests.kt +++ b/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGraphSearchTests.kt @@ -6,7 +6,6 @@ import com.r3corda.core.testing.DUMMY_NOTARY import com.r3corda.core.testing.MEGA_CORP_KEY import org.junit.Test import java.security.KeyPair -import java.security.SecureRandom import kotlin.test.assertEquals class TransactionGraphSearchTests { diff --git a/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGroupTests.kt b/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGroupTests.kt index 6fb59ef18c..97562c648b 100644 --- a/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGroupTests.kt +++ b/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGroupTests.kt @@ -7,7 +7,6 @@ import com.r3corda.core.node.services.testing.MockStorageService import com.r3corda.core.testing.* import org.junit.Test import java.security.PublicKey -import java.security.SecureRandom import java.util.* import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/core/src/test/kotlin/com/r3corda/core/crypto/Base58Test.kt b/core/src/test/kotlin/com/r3corda/core/crypto/Base58Test.kt index 8911790c5a..b11017a1ce 100644 --- a/core/src/test/kotlin/com/r3corda/core/crypto/Base58Test.kt +++ b/core/src/test/kotlin/com/r3corda/core/crypto/Base58Test.kt @@ -1,8 +1,8 @@ package com.r3corda.core.crypto -import java.math.BigInteger -import java.util.Arrays import org.junit.Test +import java.math.BigInteger +import java.util.* import kotlin.test.assertEquals import kotlin.test.assertTrue import kotlin.test.fail diff --git a/core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt b/core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt index 021c6c3251..e335db44a0 100644 --- a/core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt +++ b/core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt @@ -9,7 +9,6 @@ import com.r3corda.core.testing.* import org.junit.Before import org.junit.Test import java.security.PublicKey -import java.security.SecureRandom import java.security.SignatureException import java.util.* import kotlin.test.assertEquals diff --git a/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt index ae4276cbeb..f21b8708be 100644 --- a/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt @@ -5,7 +5,6 @@ import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.SettableFuture import com.r3corda.core.RunOnCallerThread import com.r3corda.core.contracts.SignedTransaction -import com.r3corda.core.contracts.StateRef import com.r3corda.core.crypto.Party import com.r3corda.core.messaging.MessagingService import com.r3corda.core.messaging.runOnNextMessage @@ -48,14 +47,12 @@ import com.r3corda.node.services.wallet.NodeWalletService import com.r3corda.node.utilities.ANSIProgressObserver import com.r3corda.node.utilities.AddOrRemove import com.r3corda.node.utilities.AffinityExecutor -import com.r3corda.protocols.TwoPartyDealProtocol import org.slf4j.Logger import java.nio.file.FileAlreadyExistsException import java.nio.file.Files import java.nio.file.Path import java.security.KeyPair import java.time.Clock -import java.time.Duration import java.util.* /** diff --git a/node/src/main/kotlin/com/r3corda/node/internal/Node.kt b/node/src/main/kotlin/com/r3corda/node/internal/Node.kt index 1c5c167b76..7646fa7aca 100644 --- a/node/src/main/kotlin/com/r3corda/node/internal/Node.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/Node.kt @@ -3,7 +3,6 @@ package com.r3corda.node.internal import com.codahale.metrics.JmxReporter import com.google.common.net.HostAndPort import com.r3corda.core.messaging.MessagingService -import com.r3corda.core.node.CordaPluginRegistry import com.r3corda.core.node.NodeInfo import com.r3corda.core.node.ServiceHub import com.r3corda.core.node.services.ServiceType @@ -30,7 +29,6 @@ import java.net.InetSocketAddress import java.nio.channels.FileLock import java.nio.file.Path import java.time.Clock -import java.util.* import javax.management.ObjectName class ConfigurationException(message: String) : Exception(message) diff --git a/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt b/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt index 65f22209f9..864b898e6c 100644 --- a/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt @@ -10,6 +10,7 @@ import com.r3corda.core.messaging.* import com.r3corda.core.serialization.SingletonSerializeAsToken import com.r3corda.core.utilities.loggerFor import com.r3corda.core.utilities.trace +import com.r3corda.node.services.network.InMemoryMessagingNetwork.InMemoryMessaging import org.slf4j.LoggerFactory import rx.Observable import rx.subjects.PublishSubject diff --git a/node/src/main/kotlin/com/r3corda/node/services/persistence/NodeAttachmentService.kt b/node/src/main/kotlin/com/r3corda/node/services/persistence/NodeAttachmentService.kt index 74c7182fe2..2bf71ae512 100644 --- a/node/src/main/kotlin/com/r3corda/node/services/persistence/NodeAttachmentService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/persistence/NodeAttachmentService.kt @@ -8,16 +8,12 @@ import com.google.common.io.CountingInputStream import com.r3corda.core.contracts.Attachment import com.r3corda.core.crypto.SecureHash import com.r3corda.core.extractZipFile -import com.r3corda.node.services.api.AcceptsFileUpload import com.r3corda.core.node.services.AttachmentStorage import com.r3corda.core.utilities.loggerFor +import com.r3corda.node.services.api.AcceptsFileUpload import java.io.FilterInputStream import java.io.InputStream -import java.nio.file.FileAlreadyExistsException -import java.nio.file.Files -import java.nio.file.Path -import java.nio.file.Paths -import java.nio.file.StandardCopyOption +import java.nio.file.* import java.util.* import java.util.jar.JarInputStream import javax.annotation.concurrent.ThreadSafe diff --git a/node/src/main/kotlin/com/r3corda/node/services/persistence/StorageServiceImpl.kt b/node/src/main/kotlin/com/r3corda/node/services/persistence/StorageServiceImpl.kt index 3880832a57..f2f3ba918c 100644 --- a/node/src/main/kotlin/com/r3corda/node/services/persistence/StorageServiceImpl.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/persistence/StorageServiceImpl.kt @@ -2,7 +2,6 @@ package com.r3corda.node.services.persistence import com.r3corda.core.crypto.Party import com.r3corda.core.node.services.AttachmentStorage -import com.r3corda.core.node.services.StorageService import com.r3corda.core.node.services.TransactionStorage import com.r3corda.core.node.services.TxWritableStorageService import com.r3corda.core.serialization.SingletonSerializeAsToken diff --git a/node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt b/node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt index 742061b22d..38754f72e5 100644 --- a/node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt +++ b/node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt @@ -1,8 +1,8 @@ package com.r3corda.node.servlets -import com.r3corda.node.services.api.AcceptsFileUpload -import com.r3corda.node.internal.Node import com.r3corda.core.utilities.loggerFor +import com.r3corda.node.internal.Node +import com.r3corda.node.services.api.AcceptsFileUpload import org.apache.commons.fileupload.servlet.ServletFileUpload import java.util.* import javax.servlet.http.HttpServlet diff --git a/node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt b/node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt index e9bcf5bf99..0ee7077e75 100644 --- a/node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt +++ b/node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt @@ -3,6 +3,7 @@ package com.r3corda.node.utilities import com.r3corda.core.utilities.BriefLogFormatter import com.r3corda.core.utilities.Emoji import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.node.utilities.ANSIProgressRenderer.progressTracker import org.fusesource.jansi.Ansi import org.fusesource.jansi.AnsiConsole import org.fusesource.jansi.AnsiOutputStream diff --git a/node/src/test/kotlin/com/r3corda/node/messaging/InMemoryMessagingTests.kt b/node/src/test/kotlin/com/r3corda/node/messaging/InMemoryMessagingTests.kt index 16587fb479..a8337f40c4 100644 --- a/node/src/test/kotlin/com/r3corda/node/messaging/InMemoryMessagingTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/messaging/InMemoryMessagingTests.kt @@ -4,8 +4,6 @@ package com.r3corda.node.messaging import com.r3corda.core.messaging.Message import com.r3corda.core.messaging.TopicStringValidator -import com.r3corda.core.messaging.send -import com.r3corda.core.serialization.deserialize import com.r3corda.node.internal.testing.MockNetwork import org.junit.Before import org.junit.Test diff --git a/node/src/test/kotlin/com/r3corda/node/services/NodeAttachmentStorageTest.kt b/node/src/test/kotlin/com/r3corda/node/services/NodeAttachmentStorageTest.kt index 45e06a6049..e2a258d1a0 100644 --- a/node/src/test/kotlin/com/r3corda/node/services/NodeAttachmentStorageTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/NodeAttachmentStorageTest.kt @@ -9,11 +9,7 @@ import com.r3corda.node.services.persistence.NodeAttachmentService import org.junit.Before import org.junit.Test import java.nio.charset.Charset -import java.nio.file.FileAlreadyExistsException -import java.nio.file.FileSystem -import java.nio.file.Files -import java.nio.file.Path -import java.nio.file.StandardOpenOption +import java.nio.file.* import java.util.jar.JarEntry import java.util.jar.JarOutputStream import kotlin.test.assertEquals diff --git a/node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt b/node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt index ce48cae626..0270e7ffa9 100644 --- a/node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/WalletWithCashTest.kt @@ -12,10 +12,10 @@ import com.r3corda.core.serialization.OpaqueBytes import com.r3corda.core.testing.* import com.r3corda.core.utilities.BriefLogFormatter import com.r3corda.node.services.wallet.NodeWalletService +import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.After import org.junit.Before import org.junit.Test -import org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.* import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt b/node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt index e57cffe02d..4dc34b2f5d 100644 --- a/node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt +++ b/node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt @@ -3,7 +3,9 @@ package com.r3corda.node.visualiser import com.r3corda.core.contracts.CommandData import com.r3corda.core.contracts.ContractState import com.r3corda.core.crypto.SecureHash -import com.r3corda.core.testing.* +import com.r3corda.core.testing.LedgerDSL +import com.r3corda.core.testing.TestLedgerDSLInterpreter +import com.r3corda.core.testing.TestTransactionDSLInterpreter import org.graphstream.graph.Edge import org.graphstream.graph.Node import org.graphstream.graph.implementations.SingleGraph