diff --git a/Bitcoinj.iml b/Bitcoinj.iml new file mode 100644 index 000000000..c7c8fcf7c --- /dev/null +++ b/Bitcoinj.iml @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/lib.iml b/core/core.iml similarity index 100% rename from lib/lib.iml rename to core/core.iml diff --git a/lib/pom.xml b/core/pom.xml similarity index 94% rename from lib/pom.xml rename to core/pom.xml index 3ffe06984..8036018dc 100644 --- a/lib/pom.xml +++ b/core/pom.xml @@ -25,7 +25,7 @@ 4.0.0 - bitcoinj-lib + bitcoinj-core @@ -75,14 +75,14 @@ - + - + - - - + + + @@ -99,17 +99,6 @@ - - src - tests - - - tests - - **/*.java - - - maven-compiler-plugin diff --git a/lib/src/bitcoin.proto b/core/src/bitcoin.proto similarity index 100% rename from lib/src/bitcoin.proto rename to core/src/bitcoin.proto diff --git a/lib/src/com/google/bitcoin/core/AbstractPeerEventListener.java b/core/src/main/java/com/google/bitcoin/core/AbstractPeerEventListener.java similarity index 100% rename from lib/src/com/google/bitcoin/core/AbstractPeerEventListener.java rename to core/src/main/java/com/google/bitcoin/core/AbstractPeerEventListener.java diff --git a/lib/src/com/google/bitcoin/core/AbstractWalletEventListener.java b/core/src/main/java/com/google/bitcoin/core/AbstractWalletEventListener.java similarity index 100% rename from lib/src/com/google/bitcoin/core/AbstractWalletEventListener.java rename to core/src/main/java/com/google/bitcoin/core/AbstractWalletEventListener.java diff --git a/lib/src/com/google/bitcoin/core/Address.java b/core/src/main/java/com/google/bitcoin/core/Address.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Address.java rename to core/src/main/java/com/google/bitcoin/core/Address.java diff --git a/lib/src/com/google/bitcoin/core/AddressFormatException.java b/core/src/main/java/com/google/bitcoin/core/AddressFormatException.java similarity index 100% rename from lib/src/com/google/bitcoin/core/AddressFormatException.java rename to core/src/main/java/com/google/bitcoin/core/AddressFormatException.java diff --git a/lib/src/com/google/bitcoin/core/AddressMessage.java b/core/src/main/java/com/google/bitcoin/core/AddressMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/AddressMessage.java rename to core/src/main/java/com/google/bitcoin/core/AddressMessage.java diff --git a/lib/src/com/google/bitcoin/core/AlertMessage.java b/core/src/main/java/com/google/bitcoin/core/AlertMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/AlertMessage.java rename to core/src/main/java/com/google/bitcoin/core/AlertMessage.java diff --git a/lib/src/com/google/bitcoin/core/Base58.java b/core/src/main/java/com/google/bitcoin/core/Base58.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Base58.java rename to core/src/main/java/com/google/bitcoin/core/Base58.java diff --git a/lib/src/com/google/bitcoin/core/BitcoinSerializer.java b/core/src/main/java/com/google/bitcoin/core/BitcoinSerializer.java similarity index 100% rename from lib/src/com/google/bitcoin/core/BitcoinSerializer.java rename to core/src/main/java/com/google/bitcoin/core/BitcoinSerializer.java diff --git a/lib/src/com/google/bitcoin/core/Block.java b/core/src/main/java/com/google/bitcoin/core/Block.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Block.java rename to core/src/main/java/com/google/bitcoin/core/Block.java diff --git a/lib/src/com/google/bitcoin/core/BlockChain.java b/core/src/main/java/com/google/bitcoin/core/BlockChain.java similarity index 100% rename from lib/src/com/google/bitcoin/core/BlockChain.java rename to core/src/main/java/com/google/bitcoin/core/BlockChain.java diff --git a/lib/src/com/google/bitcoin/core/ChildMessage.java b/core/src/main/java/com/google/bitcoin/core/ChildMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/ChildMessage.java rename to core/src/main/java/com/google/bitcoin/core/ChildMessage.java diff --git a/lib/src/com/google/bitcoin/core/DownloadListener.java b/core/src/main/java/com/google/bitcoin/core/DownloadListener.java similarity index 100% rename from lib/src/com/google/bitcoin/core/DownloadListener.java rename to core/src/main/java/com/google/bitcoin/core/DownloadListener.java diff --git a/lib/src/com/google/bitcoin/core/DumpedPrivateKey.java b/core/src/main/java/com/google/bitcoin/core/DumpedPrivateKey.java similarity index 100% rename from lib/src/com/google/bitcoin/core/DumpedPrivateKey.java rename to core/src/main/java/com/google/bitcoin/core/DumpedPrivateKey.java diff --git a/lib/src/com/google/bitcoin/core/ECKey.java b/core/src/main/java/com/google/bitcoin/core/ECKey.java similarity index 100% rename from lib/src/com/google/bitcoin/core/ECKey.java rename to core/src/main/java/com/google/bitcoin/core/ECKey.java diff --git a/lib/src/com/google/bitcoin/core/EmptyMessage.java b/core/src/main/java/com/google/bitcoin/core/EmptyMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/EmptyMessage.java rename to core/src/main/java/com/google/bitcoin/core/EmptyMessage.java diff --git a/lib/src/com/google/bitcoin/core/GetAddrMessage.java b/core/src/main/java/com/google/bitcoin/core/GetAddrMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/GetAddrMessage.java rename to core/src/main/java/com/google/bitcoin/core/GetAddrMessage.java diff --git a/lib/src/com/google/bitcoin/core/GetBlocksMessage.java b/core/src/main/java/com/google/bitcoin/core/GetBlocksMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/GetBlocksMessage.java rename to core/src/main/java/com/google/bitcoin/core/GetBlocksMessage.java diff --git a/lib/src/com/google/bitcoin/core/GetDataMessage.java b/core/src/main/java/com/google/bitcoin/core/GetDataMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/GetDataMessage.java rename to core/src/main/java/com/google/bitcoin/core/GetDataMessage.java diff --git a/lib/src/com/google/bitcoin/core/GetHeadersMessage.java b/core/src/main/java/com/google/bitcoin/core/GetHeadersMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/GetHeadersMessage.java rename to core/src/main/java/com/google/bitcoin/core/GetHeadersMessage.java diff --git a/lib/src/com/google/bitcoin/core/HeadersMessage.java b/core/src/main/java/com/google/bitcoin/core/HeadersMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/HeadersMessage.java rename to core/src/main/java/com/google/bitcoin/core/HeadersMessage.java diff --git a/lib/src/com/google/bitcoin/core/InventoryItem.java b/core/src/main/java/com/google/bitcoin/core/InventoryItem.java similarity index 100% rename from lib/src/com/google/bitcoin/core/InventoryItem.java rename to core/src/main/java/com/google/bitcoin/core/InventoryItem.java diff --git a/lib/src/com/google/bitcoin/core/InventoryMessage.java b/core/src/main/java/com/google/bitcoin/core/InventoryMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/InventoryMessage.java rename to core/src/main/java/com/google/bitcoin/core/InventoryMessage.java diff --git a/lib/src/com/google/bitcoin/core/ListMessage.java b/core/src/main/java/com/google/bitcoin/core/ListMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/ListMessage.java rename to core/src/main/java/com/google/bitcoin/core/ListMessage.java diff --git a/lib/src/com/google/bitcoin/core/Message.java b/core/src/main/java/com/google/bitcoin/core/Message.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Message.java rename to core/src/main/java/com/google/bitcoin/core/Message.java diff --git a/lib/src/com/google/bitcoin/core/NetworkConnection.java b/core/src/main/java/com/google/bitcoin/core/NetworkConnection.java similarity index 100% rename from lib/src/com/google/bitcoin/core/NetworkConnection.java rename to core/src/main/java/com/google/bitcoin/core/NetworkConnection.java diff --git a/lib/src/com/google/bitcoin/core/NetworkParameters.java b/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java similarity index 100% rename from lib/src/com/google/bitcoin/core/NetworkParameters.java rename to core/src/main/java/com/google/bitcoin/core/NetworkParameters.java diff --git a/lib/src/com/google/bitcoin/core/Peer.java b/core/src/main/java/com/google/bitcoin/core/Peer.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Peer.java rename to core/src/main/java/com/google/bitcoin/core/Peer.java diff --git a/lib/src/com/google/bitcoin/core/PeerAddress.java b/core/src/main/java/com/google/bitcoin/core/PeerAddress.java similarity index 100% rename from lib/src/com/google/bitcoin/core/PeerAddress.java rename to core/src/main/java/com/google/bitcoin/core/PeerAddress.java diff --git a/lib/src/com/google/bitcoin/core/PeerEventListener.java b/core/src/main/java/com/google/bitcoin/core/PeerEventListener.java similarity index 100% rename from lib/src/com/google/bitcoin/core/PeerEventListener.java rename to core/src/main/java/com/google/bitcoin/core/PeerEventListener.java diff --git a/lib/src/com/google/bitcoin/core/PeerException.java b/core/src/main/java/com/google/bitcoin/core/PeerException.java similarity index 100% rename from lib/src/com/google/bitcoin/core/PeerException.java rename to core/src/main/java/com/google/bitcoin/core/PeerException.java diff --git a/lib/src/com/google/bitcoin/core/PeerGroup.java b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java similarity index 100% rename from lib/src/com/google/bitcoin/core/PeerGroup.java rename to core/src/main/java/com/google/bitcoin/core/PeerGroup.java diff --git a/lib/src/com/google/bitcoin/core/Ping.java b/core/src/main/java/com/google/bitcoin/core/Ping.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Ping.java rename to core/src/main/java/com/google/bitcoin/core/Ping.java diff --git a/lib/src/com/google/bitcoin/core/ProtocolException.java b/core/src/main/java/com/google/bitcoin/core/ProtocolException.java similarity index 100% rename from lib/src/com/google/bitcoin/core/ProtocolException.java rename to core/src/main/java/com/google/bitcoin/core/ProtocolException.java diff --git a/lib/src/com/google/bitcoin/core/Script.java b/core/src/main/java/com/google/bitcoin/core/Script.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Script.java rename to core/src/main/java/com/google/bitcoin/core/Script.java diff --git a/lib/src/com/google/bitcoin/core/ScriptException.java b/core/src/main/java/com/google/bitcoin/core/ScriptException.java similarity index 100% rename from lib/src/com/google/bitcoin/core/ScriptException.java rename to core/src/main/java/com/google/bitcoin/core/ScriptException.java diff --git a/lib/src/com/google/bitcoin/core/Sha256Hash.java b/core/src/main/java/com/google/bitcoin/core/Sha256Hash.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Sha256Hash.java rename to core/src/main/java/com/google/bitcoin/core/Sha256Hash.java diff --git a/lib/src/com/google/bitcoin/core/StoredBlock.java b/core/src/main/java/com/google/bitcoin/core/StoredBlock.java similarity index 100% rename from lib/src/com/google/bitcoin/core/StoredBlock.java rename to core/src/main/java/com/google/bitcoin/core/StoredBlock.java diff --git a/lib/src/com/google/bitcoin/core/TCPNetworkConnection.java b/core/src/main/java/com/google/bitcoin/core/TCPNetworkConnection.java similarity index 100% rename from lib/src/com/google/bitcoin/core/TCPNetworkConnection.java rename to core/src/main/java/com/google/bitcoin/core/TCPNetworkConnection.java diff --git a/lib/src/com/google/bitcoin/core/Transaction.java b/core/src/main/java/com/google/bitcoin/core/Transaction.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Transaction.java rename to core/src/main/java/com/google/bitcoin/core/Transaction.java diff --git a/lib/src/com/google/bitcoin/core/TransactionConfidence.java b/core/src/main/java/com/google/bitcoin/core/TransactionConfidence.java similarity index 100% rename from lib/src/com/google/bitcoin/core/TransactionConfidence.java rename to core/src/main/java/com/google/bitcoin/core/TransactionConfidence.java diff --git a/lib/src/com/google/bitcoin/core/TransactionInput.java b/core/src/main/java/com/google/bitcoin/core/TransactionInput.java similarity index 100% rename from lib/src/com/google/bitcoin/core/TransactionInput.java rename to core/src/main/java/com/google/bitcoin/core/TransactionInput.java diff --git a/lib/src/com/google/bitcoin/core/TransactionOutPoint.java b/core/src/main/java/com/google/bitcoin/core/TransactionOutPoint.java similarity index 100% rename from lib/src/com/google/bitcoin/core/TransactionOutPoint.java rename to core/src/main/java/com/google/bitcoin/core/TransactionOutPoint.java diff --git a/lib/src/com/google/bitcoin/core/TransactionOutput.java b/core/src/main/java/com/google/bitcoin/core/TransactionOutput.java similarity index 100% rename from lib/src/com/google/bitcoin/core/TransactionOutput.java rename to core/src/main/java/com/google/bitcoin/core/TransactionOutput.java diff --git a/lib/src/com/google/bitcoin/core/UnknownMessage.java b/core/src/main/java/com/google/bitcoin/core/UnknownMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/UnknownMessage.java rename to core/src/main/java/com/google/bitcoin/core/UnknownMessage.java diff --git a/lib/src/com/google/bitcoin/core/UnsafeByteArrayOutputStream.java b/core/src/main/java/com/google/bitcoin/core/UnsafeByteArrayOutputStream.java similarity index 100% rename from lib/src/com/google/bitcoin/core/UnsafeByteArrayOutputStream.java rename to core/src/main/java/com/google/bitcoin/core/UnsafeByteArrayOutputStream.java diff --git a/lib/src/com/google/bitcoin/core/Utils.java b/core/src/main/java/com/google/bitcoin/core/Utils.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Utils.java rename to core/src/main/java/com/google/bitcoin/core/Utils.java diff --git a/lib/src/com/google/bitcoin/core/VarInt.java b/core/src/main/java/com/google/bitcoin/core/VarInt.java similarity index 100% rename from lib/src/com/google/bitcoin/core/VarInt.java rename to core/src/main/java/com/google/bitcoin/core/VarInt.java diff --git a/lib/src/com/google/bitcoin/core/VerificationException.java b/core/src/main/java/com/google/bitcoin/core/VerificationException.java similarity index 100% rename from lib/src/com/google/bitcoin/core/VerificationException.java rename to core/src/main/java/com/google/bitcoin/core/VerificationException.java diff --git a/lib/src/com/google/bitcoin/core/VersionAck.java b/core/src/main/java/com/google/bitcoin/core/VersionAck.java similarity index 100% rename from lib/src/com/google/bitcoin/core/VersionAck.java rename to core/src/main/java/com/google/bitcoin/core/VersionAck.java diff --git a/lib/src/com/google/bitcoin/core/VersionMessage.java b/core/src/main/java/com/google/bitcoin/core/VersionMessage.java similarity index 100% rename from lib/src/com/google/bitcoin/core/VersionMessage.java rename to core/src/main/java/com/google/bitcoin/core/VersionMessage.java diff --git a/lib/src/com/google/bitcoin/core/VersionedChecksummedBytes.java b/core/src/main/java/com/google/bitcoin/core/VersionedChecksummedBytes.java similarity index 100% rename from lib/src/com/google/bitcoin/core/VersionedChecksummedBytes.java rename to core/src/main/java/com/google/bitcoin/core/VersionedChecksummedBytes.java diff --git a/lib/src/com/google/bitcoin/core/Wallet.java b/core/src/main/java/com/google/bitcoin/core/Wallet.java similarity index 100% rename from lib/src/com/google/bitcoin/core/Wallet.java rename to core/src/main/java/com/google/bitcoin/core/Wallet.java diff --git a/lib/src/com/google/bitcoin/core/WalletEventListener.java b/core/src/main/java/com/google/bitcoin/core/WalletEventListener.java similarity index 100% rename from lib/src/com/google/bitcoin/core/WalletEventListener.java rename to core/src/main/java/com/google/bitcoin/core/WalletEventListener.java diff --git a/lib/src/com/google/bitcoin/core/WalletTransaction.java b/core/src/main/java/com/google/bitcoin/core/WalletTransaction.java similarity index 100% rename from lib/src/com/google/bitcoin/core/WalletTransaction.java rename to core/src/main/java/com/google/bitcoin/core/WalletTransaction.java diff --git a/lib/src/com/google/bitcoin/discovery/DnsDiscovery.java b/core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java similarity index 100% rename from lib/src/com/google/bitcoin/discovery/DnsDiscovery.java rename to core/src/main/java/com/google/bitcoin/discovery/DnsDiscovery.java diff --git a/lib/src/com/google/bitcoin/discovery/IrcDiscovery.java b/core/src/main/java/com/google/bitcoin/discovery/IrcDiscovery.java similarity index 100% rename from lib/src/com/google/bitcoin/discovery/IrcDiscovery.java rename to core/src/main/java/com/google/bitcoin/discovery/IrcDiscovery.java diff --git a/lib/src/com/google/bitcoin/discovery/PeerDiscovery.java b/core/src/main/java/com/google/bitcoin/discovery/PeerDiscovery.java similarity index 100% rename from lib/src/com/google/bitcoin/discovery/PeerDiscovery.java rename to core/src/main/java/com/google/bitcoin/discovery/PeerDiscovery.java diff --git a/lib/src/com/google/bitcoin/discovery/PeerDiscoveryException.java b/core/src/main/java/com/google/bitcoin/discovery/PeerDiscoveryException.java similarity index 100% rename from lib/src/com/google/bitcoin/discovery/PeerDiscoveryException.java rename to core/src/main/java/com/google/bitcoin/discovery/PeerDiscoveryException.java diff --git a/lib/src/com/google/bitcoin/discovery/SeedPeers.java b/core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java similarity index 100% rename from lib/src/com/google/bitcoin/discovery/SeedPeers.java rename to core/src/main/java/com/google/bitcoin/discovery/SeedPeers.java diff --git a/lib/src/com/google/bitcoin/store/BlockStore.java b/core/src/main/java/com/google/bitcoin/store/BlockStore.java similarity index 100% rename from lib/src/com/google/bitcoin/store/BlockStore.java rename to core/src/main/java/com/google/bitcoin/store/BlockStore.java diff --git a/lib/src/com/google/bitcoin/store/BlockStoreException.java b/core/src/main/java/com/google/bitcoin/store/BlockStoreException.java similarity index 100% rename from lib/src/com/google/bitcoin/store/BlockStoreException.java rename to core/src/main/java/com/google/bitcoin/store/BlockStoreException.java diff --git a/lib/src/com/google/bitcoin/store/BoundedOverheadBlockStore.java b/core/src/main/java/com/google/bitcoin/store/BoundedOverheadBlockStore.java similarity index 100% rename from lib/src/com/google/bitcoin/store/BoundedOverheadBlockStore.java rename to core/src/main/java/com/google/bitcoin/store/BoundedOverheadBlockStore.java diff --git a/lib/src/com/google/bitcoin/store/DerbyBlockStore.java b/core/src/main/java/com/google/bitcoin/store/DerbyBlockStore.java similarity index 100% rename from lib/src/com/google/bitcoin/store/DerbyBlockStore.java rename to core/src/main/java/com/google/bitcoin/store/DerbyBlockStore.java diff --git a/lib/src/com/google/bitcoin/store/DiskBlockStore.java b/core/src/main/java/com/google/bitcoin/store/DiskBlockStore.java similarity index 100% rename from lib/src/com/google/bitcoin/store/DiskBlockStore.java rename to core/src/main/java/com/google/bitcoin/store/DiskBlockStore.java diff --git a/lib/src/com/google/bitcoin/store/MemoryBlockStore.java b/core/src/main/java/com/google/bitcoin/store/MemoryBlockStore.java similarity index 100% rename from lib/src/com/google/bitcoin/store/MemoryBlockStore.java rename to core/src/main/java/com/google/bitcoin/store/MemoryBlockStore.java diff --git a/lib/src/com/google/bitcoin/store/WalletProtobufSerializer.java b/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java similarity index 100% rename from lib/src/com/google/bitcoin/store/WalletProtobufSerializer.java rename to core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java diff --git a/lib/src/com/google/bitcoin/uri/BitcoinURI.java b/core/src/main/java/com/google/bitcoin/uri/BitcoinURI.java similarity index 100% rename from lib/src/com/google/bitcoin/uri/BitcoinURI.java rename to core/src/main/java/com/google/bitcoin/uri/BitcoinURI.java diff --git a/lib/src/com/google/bitcoin/uri/BitcoinURIParseException.java b/core/src/main/java/com/google/bitcoin/uri/BitcoinURIParseException.java similarity index 100% rename from lib/src/com/google/bitcoin/uri/BitcoinURIParseException.java rename to core/src/main/java/com/google/bitcoin/uri/BitcoinURIParseException.java diff --git a/lib/src/com/google/bitcoin/uri/OptionalFieldValidationException.java b/core/src/main/java/com/google/bitcoin/uri/OptionalFieldValidationException.java similarity index 100% rename from lib/src/com/google/bitcoin/uri/OptionalFieldValidationException.java rename to core/src/main/java/com/google/bitcoin/uri/OptionalFieldValidationException.java diff --git a/lib/src/com/google/bitcoin/uri/RequiredFieldValidationException.java b/core/src/main/java/com/google/bitcoin/uri/RequiredFieldValidationException.java similarity index 100% rename from lib/src/com/google/bitcoin/uri/RequiredFieldValidationException.java rename to core/src/main/java/com/google/bitcoin/uri/RequiredFieldValidationException.java diff --git a/lib/src/com/google/bitcoin/utils/BriefLogFormatter.java b/core/src/main/java/com/google/bitcoin/utils/BriefLogFormatter.java similarity index 100% rename from lib/src/com/google/bitcoin/utils/BriefLogFormatter.java rename to core/src/main/java/com/google/bitcoin/utils/BriefLogFormatter.java diff --git a/lib/src/com/google/bitcoin/utils/EventListenerInvoker.java b/core/src/main/java/com/google/bitcoin/utils/EventListenerInvoker.java similarity index 100% rename from lib/src/com/google/bitcoin/utils/EventListenerInvoker.java rename to core/src/main/java/com/google/bitcoin/utils/EventListenerInvoker.java diff --git a/lib/src/org/bitcoinj/wallet/Protos.java b/core/src/main/java/org/bitcoinj/wallet/Protos.java similarity index 100% rename from lib/src/org/bitcoinj/wallet/Protos.java rename to core/src/main/java/org/bitcoinj/wallet/Protos.java diff --git a/lib/tests/com/google/bitcoin/core/AddressTest.java b/core/src/test/java/com/google/bitcoin/core/AddressTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/AddressTest.java rename to core/src/test/java/com/google/bitcoin/core/AddressTest.java diff --git a/lib/tests/com/google/bitcoin/core/AlertMessageTest.java b/core/src/test/java/com/google/bitcoin/core/AlertMessageTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/AlertMessageTest.java rename to core/src/test/java/com/google/bitcoin/core/AlertMessageTest.java diff --git a/lib/tests/com/google/bitcoin/core/Base58Test.java b/core/src/test/java/com/google/bitcoin/core/Base58Test.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/Base58Test.java rename to core/src/test/java/com/google/bitcoin/core/Base58Test.java diff --git a/lib/tests/com/google/bitcoin/core/BitcoinSerializerTest.java b/core/src/test/java/com/google/bitcoin/core/BitcoinSerializerTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/BitcoinSerializerTest.java rename to core/src/test/java/com/google/bitcoin/core/BitcoinSerializerTest.java diff --git a/lib/tests/com/google/bitcoin/core/BlockChainTest.java b/core/src/test/java/com/google/bitcoin/core/BlockChainTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/BlockChainTest.java rename to core/src/test/java/com/google/bitcoin/core/BlockChainTest.java diff --git a/lib/tests/com/google/bitcoin/core/BlockTest.java b/core/src/test/java/com/google/bitcoin/core/BlockTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/BlockTest.java rename to core/src/test/java/com/google/bitcoin/core/BlockTest.java diff --git a/lib/tests/com/google/bitcoin/core/ChainSplitTests.java b/core/src/test/java/com/google/bitcoin/core/ChainSplitTests.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/ChainSplitTests.java rename to core/src/test/java/com/google/bitcoin/core/ChainSplitTests.java diff --git a/lib/tests/com/google/bitcoin/core/ECKeyTest.java b/core/src/test/java/com/google/bitcoin/core/ECKeyTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/ECKeyTest.java rename to core/src/test/java/com/google/bitcoin/core/ECKeyTest.java diff --git a/lib/tests/com/google/bitcoin/core/LazyParseByteCacheTest.java b/core/src/test/java/com/google/bitcoin/core/LazyParseByteCacheTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/LazyParseByteCacheTest.java rename to core/src/test/java/com/google/bitcoin/core/LazyParseByteCacheTest.java diff --git a/lib/tests/com/google/bitcoin/core/MockNetworkConnection.java b/core/src/test/java/com/google/bitcoin/core/MockNetworkConnection.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/MockNetworkConnection.java rename to core/src/test/java/com/google/bitcoin/core/MockNetworkConnection.java diff --git a/lib/tests/com/google/bitcoin/core/PeerAddressTest.java b/core/src/test/java/com/google/bitcoin/core/PeerAddressTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/PeerAddressTest.java rename to core/src/test/java/com/google/bitcoin/core/PeerAddressTest.java diff --git a/lib/tests/com/google/bitcoin/core/PeerGroupTest.java b/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/PeerGroupTest.java rename to core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java diff --git a/lib/tests/com/google/bitcoin/core/PeerTest.java b/core/src/test/java/com/google/bitcoin/core/PeerTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/PeerTest.java rename to core/src/test/java/com/google/bitcoin/core/PeerTest.java diff --git a/lib/tests/com/google/bitcoin/core/ScriptTest.java b/core/src/test/java/com/google/bitcoin/core/ScriptTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/ScriptTest.java rename to core/src/test/java/com/google/bitcoin/core/ScriptTest.java diff --git a/lib/tests/com/google/bitcoin/core/TestUtils.java b/core/src/test/java/com/google/bitcoin/core/TestUtils.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/TestUtils.java rename to core/src/test/java/com/google/bitcoin/core/TestUtils.java diff --git a/lib/tests/com/google/bitcoin/core/TestWithNetworkConnections.java b/core/src/test/java/com/google/bitcoin/core/TestWithNetworkConnections.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/TestWithNetworkConnections.java rename to core/src/test/java/com/google/bitcoin/core/TestWithNetworkConnections.java diff --git a/lib/tests/com/google/bitcoin/core/UtilsTest.java b/core/src/test/java/com/google/bitcoin/core/UtilsTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/UtilsTest.java rename to core/src/test/java/com/google/bitcoin/core/UtilsTest.java diff --git a/lib/tests/com/google/bitcoin/core/VarIntTest.java b/core/src/test/java/com/google/bitcoin/core/VarIntTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/VarIntTest.java rename to core/src/test/java/com/google/bitcoin/core/VarIntTest.java diff --git a/lib/tests/com/google/bitcoin/core/WalletTest.java b/core/src/test/java/com/google/bitcoin/core/WalletTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/core/WalletTest.java rename to core/src/test/java/com/google/bitcoin/core/WalletTest.java diff --git a/lib/tests/com/google/bitcoin/discovery/IrcDiscoveryTest.java b/core/src/test/java/com/google/bitcoin/discovery/IrcDiscoveryTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/discovery/IrcDiscoveryTest.java rename to core/src/test/java/com/google/bitcoin/discovery/IrcDiscoveryTest.java diff --git a/lib/tests/com/google/bitcoin/discovery/SeedPeersTest.java b/core/src/test/java/com/google/bitcoin/discovery/SeedPeersTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/discovery/SeedPeersTest.java rename to core/src/test/java/com/google/bitcoin/discovery/SeedPeersTest.java diff --git a/lib/tests/com/google/bitcoin/store/BoundedOverheadBlockStoreTest.java b/core/src/test/java/com/google/bitcoin/store/BoundedOverheadBlockStoreTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/store/BoundedOverheadBlockStoreTest.java rename to core/src/test/java/com/google/bitcoin/store/BoundedOverheadBlockStoreTest.java diff --git a/lib/tests/com/google/bitcoin/store/DerbyBlockStoreTest.java b/core/src/test/java/com/google/bitcoin/store/DerbyBlockStoreTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/store/DerbyBlockStoreTest.java rename to core/src/test/java/com/google/bitcoin/store/DerbyBlockStoreTest.java diff --git a/lib/tests/com/google/bitcoin/store/DiskBlockStoreTest.java b/core/src/test/java/com/google/bitcoin/store/DiskBlockStoreTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/store/DiskBlockStoreTest.java rename to core/src/test/java/com/google/bitcoin/store/DiskBlockStoreTest.java diff --git a/lib/tests/com/google/bitcoin/store/WalletProtobufSerializerTest.java b/core/src/test/java/com/google/bitcoin/store/WalletProtobufSerializerTest.java similarity index 100% rename from lib/tests/com/google/bitcoin/store/WalletProtobufSerializerTest.java rename to core/src/test/java/com/google/bitcoin/store/WalletProtobufSerializerTest.java diff --git a/lib/tests/com/google/bitcoin/uri/BitcoinURITest.java b/core/src/test/java/com/google/bitcoin/uri/BitcoinURITest.java similarity index 100% rename from lib/tests/com/google/bitcoin/uri/BitcoinURITest.java rename to core/src/test/java/com/google/bitcoin/uri/BitcoinURITest.java diff --git a/lib/tests/com/google/bitcoin/core/old1.wallet b/core/src/test/resources/com/google/bitcoin/core/old1.wallet similarity index 100% rename from lib/tests/com/google/bitcoin/core/old1.wallet rename to core/src/test/resources/com/google/bitcoin/core/old1.wallet diff --git a/examples/examples.iml b/examples/examples.iml index 09b0a34bb..1a5771871 100644 --- a/examples/examples.iml +++ b/examples/examples.iml @@ -1,14 +1,18 @@ - - - + + + + - + + - + - + + +