From 03096755282e1110079bc434e2a64fda3a1dea5a Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 2 May 2018 14:13:42 -0400 Subject: [PATCH] Refactor multi-module build - separate Java source copied from libsecp256k1 into separate module - split main module into core core-gen core-test - generators can be published separated to core code for use in 3rd-party tests - code coverage needs to be aggregated --- build.sbt | 70 +++++++------ core-test/build.sbt | 14 +++ .../java/org/bitcoin/NativeSecp256k1Test.java | 0 .../bitcoins/core/bloom/BloomFilterTest.scala | 0 .../core/config/NetworkParametersTest.scala | 0 .../bitcoins/core/consensus/MerkleTest.scala | 0 .../core/crypto/DERSignatureUtilTest.scala | 0 .../core/crypto/ECDigitalSignatureTest.scala | 0 .../core/crypto/ECPublicKeyTest.scala | 0 .../org/bitcoins/core/crypto/ExtKeySpec.scala | 0 .../org/bitcoins/core/crypto/ExtKeyTest.scala | 0 ...ransactionSignatureCheckerResultTest.scala | 0 .../TransactionSignatureCheckerTest.scala | 0 .../TransactionSignatureCreatorSpec.scala | 0 .../TransactionSignatureCreatorTest.scala | 0 .../TransactionSignatureSerializerTest.scala | 0 .../org/bitcoins/core/number/Int32Spec.scala | 0 .../org/bitcoins/core/number/Int32Test.scala | 0 .../org/bitcoins/core/number/Int64Spec.scala | 0 .../org/bitcoins/core/number/Int64Test.scala | 0 .../org/bitcoins/core/number/UInt32Spec.scala | 0 .../org/bitcoins/core/number/UInt32Test.scala | 0 .../org/bitcoins/core/number/UInt64Spec.scala | 0 .../org/bitcoins/core/number/UInt64Test.scala | 0 .../org/bitcoins/core/number/UInt8Spec.scala | 0 .../org/bitcoins/core/number/UInt8Test.scala | 0 .../org/bitcoins/core/policy/PolicyTest.scala | 0 .../core/protocol/AddressFactoryTest.scala | 0 .../bitcoins/core/protocol/AddressTest.scala | 0 .../bitcoins/core/protocol/Bech32Spec.scala | 0 .../bitcoins/core/protocol/Bech32Test.scala | 0 .../core/protocol/BitcoinAddressSpec.scala | 0 .../core/protocol/BitcoinAddressTest.scala | 0 .../core/protocol/CompactSizeUIntSpec.scala | 0 .../core/protocol/CompactSizeUIntTest.scala | 0 .../protocol/blockchain/BlockHeaderSpec.scala | 0 .../core/protocol/blockchain/BlockTest.scala | 0 .../protocol/blockchain/ChainParamsTest.scala | 0 .../protocol/blockchain/MerkleBlockSpec.scala | 0 .../blockchain/MerkleBlockTests.scala | 0 .../blockchain/PartialMerkleTreeSpec.scala | 0 .../blockchain/PartialMerkleTreeTests.scala | 0 .../script/CLTVScriptPubKeySpec.scala | 0 .../script/CLTVScriptPubKeyTest.scala | 0 .../protocol/script/CSVScriptPubKeySpec.scala | 0 .../protocol/script/CSVScriptPubKeyTest.scala | 0 .../MultiSignatureScriptPubKeySpec.scala | 0 .../MultiSignatureScriptPubKeyTest.scala | 0 .../MultiSignatureScriptSignatureSpec.scala | 0 .../MultiSignatureScriptSignatureTest.scala | 0 .../script/P2PKHScriptPubKeySpec.scala | 0 .../script/P2PKHScriptPubKeyTest.scala | 0 .../script/P2PKHScriptSignatureSpec.scala | 0 .../script/P2PKHScriptSignatureTest.scala | 0 .../script/P2PKScriptPubKeySpec.scala | 0 .../script/P2PKScriptPubKeyTest.scala | 0 .../script/P2PKScriptSignatureSpec.scala | 0 .../script/P2PKScriptSignatureTest.scala | 0 .../script/P2SHScriptPubKeySpec.scala | 0 .../script/P2SHScriptSignatureSpec.scala | 0 .../script/P2SHScriptSignatureTest.scala | 0 .../script/ScriptPubKeyFactoryTest.scala | 0 .../protocol/script/ScriptPubKeyTest.scala | 0 .../script/ScriptSignatureFactoryTest.scala | 0 .../protocol/script/ScriptSignatureTest.scala | 0 .../core/protocol/script/ScriptSpec.scala | 0 .../protocol/script/ScriptWitnessSpec.scala | 0 .../script/WitnessCommitmentSpec.scala | 0 .../script/WitnessCommitmentTest.scala | 0 .../script/WitnessScriptPubKeySpec.scala | 0 .../testprotocol/SignatureHashTestCase.scala | 0 .../transaction/TransactionInputSpec.scala | 0 .../transaction/TransactionInputTest.scala | 0 .../transaction/TransactionOutPointSpec.scala | 0 .../transaction/TransactionOutPointTest.scala | 0 .../transaction/TransactionOutputSpec.scala | 0 .../transaction/TransactionOutputTest.scala | 0 .../transaction/TransactionTest.scala | 0 .../transaction/TransactionWitnessSpec.scala | 0 .../CoreTransactionTestCase.scala | 0 .../script/ScriptConstantFactoryTest.scala | 0 .../script/ScriptOperationFactoryTest.scala | 0 .../script/ScriptProgramFactoryTest.scala | 0 .../core/script/ScriptProgramTest.scala | 0 .../ArithmeticInterpreterTest.scala | 0 .../ArithmeticOperationsFactoryTest.scala | 0 .../arithmetic/ArithmeticOperationsTest.scala | 0 .../bitwise/BitwiseInterpreterTest.scala | 0 .../BitwiseOperationsFactoryTest.scala | 0 .../bitwise/BitwiseOperationsTest.scala | 0 .../BytesToPushOntoStackFactoryTest.scala | 0 .../constant/ConstantInterpreterTest.scala | 0 .../core/script/constant/ConstantsTest.scala | 0 .../constant/ScriptNumberFactoryTest.scala | 0 .../script/constant/ScriptNumberSpec.scala | 0 .../script/constant/ScriptNumberTest.scala | 0 .../constant/ScriptNumberUtilTest.scala | 0 .../ControlOperationsFactoryTest.scala | 0 .../ControlOperationsInterpreterTest.scala | 0 .../control/ControlOperationsTest.scala | 0 .../script/crypto/CryptoInterpreterTest.scala | 0 .../crypto/CryptoOperationsFactoryTest.scala | 0 .../script/crypto/CryptoOperationsTest.scala | 0 ...CryptoSignatureEvaluationFactoryTest.scala | 0 .../core/script/crypto/HashTypeTest.scala | 0 .../script/flag/ScriptFlagFactoryTest.scala | 0 .../core/script/flag/ScriptFlagUtilTest.scala | 0 .../core/script/flag/ScriptFlagsTest.scala | 0 .../interpreter/ScriptInterpreterTest.scala | 0 .../script/interpreter/script_invalid.json | 0 .../core/script/interpreter/script_valid.json | 0 .../testprotocol/CoreTestCase.scala | 0 .../ScriptPubKeyCoreTestCase.scala | 0 .../ScriptSignatureCoreTestCase.scala | 0 .../locktime/LockTimeInterpreterTest.scala | 0 .../LocktimeOperationFactoryTest.scala | 0 .../locktime/LocktimeOperationTest.scala | 0 .../ReservedOperationsFactoryTest.scala | 0 .../script/splice/SpliceInterpreterTest.scala | 0 .../splice/SpliceOperationFactoryTest.scala | 0 .../script/stack/StackInterpreterTest.scala | 0 .../stack/StackOperationFactoryTest.scala | 0 .../script/stack/StackOperationsTest.scala | 0 .../RawSatoshisSerializerSpec.scala | 0 .../serializers/RawSerializerHelperSpec.scala | 0 .../RawBlockHeaderSerializerTest.scala | 0 .../blockchain/RawBlockSerializerTest.scala | 0 .../RawMerkleBlockSerializerTest.scala | 0 .../script/RawScriptPubKeyParserTest.scala | 0 .../script/RawScriptSignatureParserTest.scala | 0 .../serializers/script/ScriptParserTest.scala | 0 .../RawBaseTransactionParserTest.scala | 0 .../RawTransactionInputParserTest.scala | 0 .../RawTransactionOutPointParserTest.scala | 0 .../RawTransactionOutputParserTest.scala | 0 .../RawWitnessTransactionParserTest.scala | 0 .../org/bitcoins/core/util/Base58Test.scala | 0 .../bitcoins/core/util/BinaryTreeTest.scala | 0 .../bitcoins/core/util/BitcoinSUtilSpec.scala | 0 .../bitcoins/core/util/BitcoinSUtilTest.scala | 0 .../core/util/BitcoinScriptUtilTest.scala | 0 .../bitcoins/core/util/CryptoTestUtil.scala | 0 .../bitcoins/core/util/CryptoUtilTest.scala | 0 .../bitcoins/core/util/NumberUtilSpec.scala | 0 .../core/util/ScriptProgramTestUtil.scala | 0 .../org/bitcoins/core/util/TestUtil.scala | 0 .../core/util/TransactionTestUtil.scala | 0 .../testprotocol/Base58InvalidTestCase.scala | 0 .../testprotocol/Base58ValidTestCase.scala | 0 .../core/util/testprotocol/ConfigParams.scala | 0 core/build.sbt | 20 ++++ .../org/bitcoins/core/bloom/BloomFilter.scala | 0 .../org/bitcoins/core/bloom/BloomFlag.scala | 0 .../core/config/NetworkParameters.scala | 0 .../bitcoins/core/consensus/Consensus.scala | 0 .../org/bitcoins/core/consensus/Merkle.scala | 0 .../org/bitcoins/core/crypto/ChainCode.scala | 0 .../bitcoins/core/crypto/CryptoParams.scala | 0 .../core/crypto/DERSignatureUtil.scala | 0 .../core/crypto/ECDigitalSignature.scala | 0 .../org/bitcoins/core/crypto/ECKey.scala | 0 .../org/bitcoins/core/crypto/ExtKey.scala | 0 .../bitcoins/core/crypto/ExtKeyVersion.scala | 0 .../org/bitcoins/core/crypto/HashDigest.scala | 0 .../scala/org/bitcoins/core/crypto/Sign.scala | 0 .../crypto/TransactionSignatureChecker.scala | 0 .../TransactionSignatureCheckerResult.scala | 0 .../crypto/TransactionSignatureCreator.scala | 0 .../TransactionSignatureSerializer.scala | 0 .../bitcoins/core/crypto/TxSigComponent.scala | 0 .../core/currency/CurrencyUnits.scala | 0 .../org/bitcoins/core/number/NumberType.scala | 0 .../org/bitcoins/core/policy/Policy.scala | 0 .../org/bitcoins/core/protocol/Address.scala | 0 .../core/protocol/CompactSizeUInt.scala | 0 .../core/protocol/NetworkElement.scala | 0 .../core/protocol/blockchain/Block.scala | 0 .../protocol/blockchain/BlockHeader.scala | 0 .../protocol/blockchain/ChainParams.scala | 0 .../protocol/blockchain/MerkleBlock.scala | 0 .../blockchain/PartialMerkleTree.scala | 0 .../core/protocol/script/ScriptFactory.scala | 0 .../core/protocol/script/ScriptPubKey.scala | 0 .../protocol/script/ScriptPubKeyFactory.scala | 0 .../protocol/script/ScriptSignature.scala | 0 .../core/protocol/script/ScriptWitness.scala | 0 .../protocol/script/SignatureVersion.scala | 0 .../core/protocol/script/WitnessVersion.scala | 0 .../protocol/transaction/Transaction.scala | 0 .../transaction/TransactionConstants.scala | 0 .../transaction/TransactionFactory.scala | 0 .../transaction/TransactionInput.scala | 0 .../transaction/TransactionOutPoint.scala | 0 .../transaction/TransactionOutput.scala | 0 .../transaction/TransactionWitness.scala | 0 .../core/script/ScriptOperationFactory.scala | 0 .../bitcoins/core/script/ScriptProgram.scala | 0 .../arithmetic/ArithmeticInterpreter.scala | 0 .../arithmetic/ArithmeticOperations.scala | 0 .../script/bitwise/BitwiseInterpreter.scala | 0 .../script/bitwise/BitwiseOperations.scala | 0 .../constant/BytesToPushOntoStack.scala | 0 .../script/constant/ConstantInterpreter.scala | 0 .../core/script/constant/Constants.scala | 0 .../script/constant/ScriptNumberUtil.scala | 0 .../constant/StackPushOperationFactory.scala | 0 .../script/control/ControlOperations.scala | 0 .../ControlOperationsInterpreter.scala | 0 .../script/crypto/CryptoInterpreter.scala | 0 .../core/script/crypto/CryptoOperations.scala | 0 .../CryptoSignatureEvaluationFactory.scala | 0 .../core/script/crypto/HashType.scala | 0 .../core/script/flag/ScriptFlagFactory.scala | 0 .../core/script/flag/ScriptFlagUtil.scala | 0 .../core/script/flag/ScriptFlags.scala | 0 .../interpreter/ScriptInterpreter.scala | 0 .../script/locktime/LockTimeInterpreter.scala | 0 .../script/locktime/LocktimeOperations.scala | 0 .../script/reserved/ReservedOperations.scala | 0 .../core/script/result/ScriptResult.scala | 0 .../script/splice/SpliceInterpreter.scala | 0 .../core/script/splice/SpliceOperations.scala | 0 .../core/script/stack/StackInterpreter.scala | 0 .../core/script/stack/StackOperations.scala | 0 .../serializers/RawBitcoinSerializer.scala | 0 .../RawBitcoinSerializerHelper.scala | 0 .../serializers/RawSatoshisSerializer.scala | 0 .../blockchain/RawBlockHeaderSerializer.scala | 0 .../blockchain/RawBlockSerializer.scala | 0 .../blockchain/RawMerkleBlockSerializer.scala | 0 .../bloom/RawBloomFilterSerializer.scala | 0 .../script/RawScriptPubKeyParser.scala | 0 .../script/RawScriptSignatureParser.scala | 0 .../script/RawScriptWitnessParser.scala | 0 .../serializers/script/ScriptParser.scala | 0 .../RawTransactionInputParser.scala | 0 .../RawTransactionOutPointParser.scala | 0 .../RawTransactionOutputParser.scala | 0 .../RawTransactionWitnessParser.scala | 0 .../scala/org/bitcoins/core/util/Base58.scala | 0 .../org/bitcoins/core/util/BinaryTree.scala | 0 .../org/bitcoins/core/util/BitcoinSUtil.scala | 0 .../core/util/BitcoinScriptUtil.scala | 0 .../org/bitcoins/core/util/CryptoUtil.scala | 0 .../org/bitcoins/core/util/Factory.scala | 0 .../org/bitcoins/core/util/NumberUtil.scala | 0 .../core/wallet/builder/TxBuilderError.scala | 0 .../bitcoins/core/wallet/fee/FeeUnit.scala | 0 .../core/wallet/signer/FundingInfo.scala | 0 .../bitcoins/core/wallet/signer/Signer.scala | 0 inThisBuild.sbt | 6 ++ project/Deps.scala | 70 ++++++++----- secp256k1jni/build.sbt | 9 ++ .../java/org/bitcoin/NativeSecp256k1.java | 0 .../java/org/bitcoin/NativeSecp256k1Util.java | 0 .../java/org/bitcoin/Secp256k1Context.java | 0 .../core/crypto/ECPrivateKeyTest.scala | 99 ------------------- 257 files changed, 131 insertions(+), 157 deletions(-) create mode 100644 core-test/build.sbt rename {src => core-test/src}/test/java/org/bitcoin/NativeSecp256k1Test.java (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/bloom/BloomFilterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/config/NetworkParametersTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/consensus/MerkleTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/DERSignatureUtilTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/ECDigitalSignatureTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/ECPublicKeyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/ExtKeySpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/ExtKeyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResultTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/Int32Spec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/Int32Test.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/Int64Spec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/Int64Test.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/UInt32Spec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/UInt32Test.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/UInt64Spec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/UInt64Test.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/UInt8Spec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/number/UInt8Test.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/policy/PolicyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/AddressFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/AddressTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/Bech32Spec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/Bech32Test.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/BitcoinAddressSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/BitcoinAddressTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/CompactSizeUIntSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/CompactSizeUIntTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/blockchain/BlockHeaderSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/blockchain/BlockTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/blockchain/ChainParamsTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockTests.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeTests.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeySpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeySpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeySpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeySpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeySpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2SHScriptPubKeySpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/ScriptSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/ScriptWitnessSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/WitnessScriptPubKeySpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/script/testprotocol/SignatureHashTestCase.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/TransactionWitnessSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/protocol/transaction/testprotocol/CoreTransactionTestCase.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/ScriptConstantFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/ScriptOperationFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/ScriptProgramFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/ScriptProgramTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/constant/BytesToPushOntoStackFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/constant/ConstantInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/constant/ConstantsTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/constant/ScriptNumberFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/constant/ScriptNumberSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/constant/ScriptNumberTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/constant/ScriptNumberUtilTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/control/ControlOperationsFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/control/ControlOperationsTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/crypto/CryptoInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/crypto/HashTypeTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/flag/ScriptFlagFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/flag/ScriptFlagUtilTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/flag/ScriptFlagsTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/interpreter/ScriptInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/interpreter/script_invalid.json (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/interpreter/script_valid.json (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/interpreter/testprotocol/CoreTestCase.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptPubKeyCoreTestCase.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptSignatureCoreTestCase.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/locktime/LockTimeInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/reserved/ReservedOperationsFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/splice/SpliceInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/splice/SpliceOperationFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/stack/StackInterpreterTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/stack/StackOperationFactoryTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/script/stack/StackOperationsTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/RawSatoshisSerializerSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/RawSerializerHelperSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializerTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializerTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializerTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/transaction/RawBaseTransactionParserTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/serializers/transaction/RawWitnessTransactionParserTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/Base58Test.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/BinaryTreeTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/BitcoinSUtilSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/BitcoinSUtilTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/BitcoinScriptUtilTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/CryptoTestUtil.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/CryptoUtilTest.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/NumberUtilSpec.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/ScriptProgramTestUtil.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/TestUtil.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/TransactionTestUtil.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/testprotocol/Base58InvalidTestCase.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/testprotocol/Base58ValidTestCase.scala (100%) rename {src => core-test/src}/test/scala/org/bitcoins/core/util/testprotocol/ConfigParams.scala (100%) create mode 100644 core/build.sbt rename {src => core/src}/main/scala/org/bitcoins/core/bloom/BloomFilter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/bloom/BloomFlag.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/config/NetworkParameters.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/consensus/Consensus.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/consensus/Merkle.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/ChainCode.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/CryptoParams.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/DERSignatureUtil.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/ECDigitalSignature.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/ECKey.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/ExtKey.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/ExtKeyVersion.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/HashDigest.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/Sign.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResult.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/TransactionSignatureCreator.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/crypto/TxSigComponent.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/currency/CurrencyUnits.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/number/NumberType.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/policy/Policy.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/Address.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/CompactSizeUInt.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/NetworkElement.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/blockchain/Block.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/blockchain/BlockHeader.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/blockchain/ChainParams.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/blockchain/MerkleBlock.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTree.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/script/ScriptFactory.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/script/SignatureVersion.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/script/WitnessVersion.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/transaction/TransactionConstants.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/ScriptProgram.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperations.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/bitwise/BitwiseOperations.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/constant/BytesToPushOntoStack.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/constant/ConstantInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/constant/Constants.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/constant/ScriptNumberUtil.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/constant/StackPushOperationFactory.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/control/ControlOperations.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/crypto/CryptoInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/crypto/CryptoOperations.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactory.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/crypto/HashType.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/flag/ScriptFlagFactory.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/flag/ScriptFlagUtil.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/flag/ScriptFlags.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/locktime/LockTimeInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/locktime/LocktimeOperations.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/reserved/ReservedOperations.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/result/ScriptResult.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/splice/SpliceInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/splice/SpliceOperations.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/stack/StackInterpreter.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/script/stack/StackOperations.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/RawSatoshisSerializer.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializer.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializer.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializer.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/bloom/RawBloomFilterSerializer.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/script/RawScriptWitnessParser.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionWitnessParser.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/util/Base58.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/util/BinaryTree.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/util/BitcoinSUtil.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/util/BitcoinScriptUtil.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/util/CryptoUtil.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/util/Factory.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/util/NumberUtil.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/wallet/builder/TxBuilderError.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/wallet/fee/FeeUnit.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/wallet/signer/FundingInfo.scala (100%) rename {src => core/src}/main/scala/org/bitcoins/core/wallet/signer/Signer.scala (100%) create mode 100644 inThisBuild.sbt create mode 100644 secp256k1jni/build.sbt rename {src => secp256k1jni/src}/main/java/org/bitcoin/NativeSecp256k1.java (100%) rename {src => secp256k1jni/src}/main/java/org/bitcoin/NativeSecp256k1Util.java (100%) rename {src => secp256k1jni/src}/main/java/org/bitcoin/Secp256k1Context.java (100%) delete mode 100644 src/test/scala/org/bitcoins/core/crypto/ECPrivateKeyTest.scala diff --git a/build.sbt b/build.sbt index 4e8c3bc39b..b0c81d93df 100644 --- a/build.sbt +++ b/build.sbt @@ -1,39 +1,45 @@ -import Deps._ -lazy val commonSettings = Seq( - organization := "org.bitcoins", - version := "0.0.1-SNAPSHOT", - scalaVersion := "2.11.7" -) +lazy val root = project + .in(file(".")) + .aggregate( + secp256k1jni, + core, + coreGen, + coreTest, + zmq + ) +lazy val secp256k1jni = project + .in(file("secp256k1jni")) + .enablePlugins() -lazy val appName = "bitcoin-s-core" +lazy val core = project + .in(file("core")) + .enablePlugins() + .dependsOn( + secp256k1jni + ) -lazy val root = Project(appName, file(".")).enablePlugins().settings( - commonSettings, - libraryDependencies ++= Deps.root -) +lazy val coreGen = project + .in(file("core-gen")) + .enablePlugins() + .dependsOn( + core + ) -lazy val zmq = Project("bitcoin-s-zmq", file("zmq")).enablePlugins().settings( - commonSettings, - libraryDependencies ++= Deps.zmq -).dependsOn(root) +lazy val coreTest = project + .in(file("core-test")) + .enablePlugins() + .dependsOn( + core, + coreGen % "test->test" + ) +lazy val zmq = project + .in(file("zmq")) + .enablePlugins() + .dependsOn( + core + ) -//test in assembly := {} - -testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "2") - -//testOptions in Test += Tests.Argument("-oF") - -//parallelExecution in Test := false - -coverageExcludedPackages := ".*gen" - -coverageMinimum := 90 - -coverageFailOnMinimum := true - -assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false) - -scalacOptions ++= Seq("-Xmax-classfile-name", "140") +publishArtifact in root := false diff --git a/core-test/build.sbt b/core-test/build.sbt new file mode 100644 index 0000000000..75eaf6d472 --- /dev/null +++ b/core-test/build.sbt @@ -0,0 +1,14 @@ + +name := "bitcoin-s-core-test" + +libraryDependencies ++= Deps.coreTest + +publishArtifact := false + +testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "2") + +coverageExcludedPackages := ".*gen" + +coverageMinimum := 90 + +coverageFailOnMinimum := true diff --git a/src/test/java/org/bitcoin/NativeSecp256k1Test.java b/core-test/src/test/java/org/bitcoin/NativeSecp256k1Test.java similarity index 100% rename from src/test/java/org/bitcoin/NativeSecp256k1Test.java rename to core-test/src/test/java/org/bitcoin/NativeSecp256k1Test.java diff --git a/src/test/scala/org/bitcoins/core/bloom/BloomFilterTest.scala b/core-test/src/test/scala/org/bitcoins/core/bloom/BloomFilterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/bloom/BloomFilterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/bloom/BloomFilterTest.scala diff --git a/src/test/scala/org/bitcoins/core/config/NetworkParametersTest.scala b/core-test/src/test/scala/org/bitcoins/core/config/NetworkParametersTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/config/NetworkParametersTest.scala rename to core-test/src/test/scala/org/bitcoins/core/config/NetworkParametersTest.scala diff --git a/src/test/scala/org/bitcoins/core/consensus/MerkleTest.scala b/core-test/src/test/scala/org/bitcoins/core/consensus/MerkleTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/consensus/MerkleTest.scala rename to core-test/src/test/scala/org/bitcoins/core/consensus/MerkleTest.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/DERSignatureUtilTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/DERSignatureUtilTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/DERSignatureUtilTest.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/DERSignatureUtilTest.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/ECDigitalSignatureTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/ECDigitalSignatureTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/ECDigitalSignatureTest.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/ECDigitalSignatureTest.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/ECPublicKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/ECPublicKeyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/ECPublicKeyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/ECPublicKeyTest.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/ExtKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/ExtKeySpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/ExtKeySpec.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/ExtKeySpec.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/ExtKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/ExtKeyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/ExtKeyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/ExtKeyTest.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResultTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResultTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResultTest.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResultTest.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerTest.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerTest.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorSpec.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorSpec.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorTest.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureCreatorTest.scala diff --git a/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala rename to core-test/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala diff --git a/src/test/scala/org/bitcoins/core/number/Int32Spec.scala b/core-test/src/test/scala/org/bitcoins/core/number/Int32Spec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/Int32Spec.scala rename to core-test/src/test/scala/org/bitcoins/core/number/Int32Spec.scala diff --git a/src/test/scala/org/bitcoins/core/number/Int32Test.scala b/core-test/src/test/scala/org/bitcoins/core/number/Int32Test.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/Int32Test.scala rename to core-test/src/test/scala/org/bitcoins/core/number/Int32Test.scala diff --git a/src/test/scala/org/bitcoins/core/number/Int64Spec.scala b/core-test/src/test/scala/org/bitcoins/core/number/Int64Spec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/Int64Spec.scala rename to core-test/src/test/scala/org/bitcoins/core/number/Int64Spec.scala diff --git a/src/test/scala/org/bitcoins/core/number/Int64Test.scala b/core-test/src/test/scala/org/bitcoins/core/number/Int64Test.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/Int64Test.scala rename to core-test/src/test/scala/org/bitcoins/core/number/Int64Test.scala diff --git a/src/test/scala/org/bitcoins/core/number/UInt32Spec.scala b/core-test/src/test/scala/org/bitcoins/core/number/UInt32Spec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/UInt32Spec.scala rename to core-test/src/test/scala/org/bitcoins/core/number/UInt32Spec.scala diff --git a/src/test/scala/org/bitcoins/core/number/UInt32Test.scala b/core-test/src/test/scala/org/bitcoins/core/number/UInt32Test.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/UInt32Test.scala rename to core-test/src/test/scala/org/bitcoins/core/number/UInt32Test.scala diff --git a/src/test/scala/org/bitcoins/core/number/UInt64Spec.scala b/core-test/src/test/scala/org/bitcoins/core/number/UInt64Spec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/UInt64Spec.scala rename to core-test/src/test/scala/org/bitcoins/core/number/UInt64Spec.scala diff --git a/src/test/scala/org/bitcoins/core/number/UInt64Test.scala b/core-test/src/test/scala/org/bitcoins/core/number/UInt64Test.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/UInt64Test.scala rename to core-test/src/test/scala/org/bitcoins/core/number/UInt64Test.scala diff --git a/src/test/scala/org/bitcoins/core/number/UInt8Spec.scala b/core-test/src/test/scala/org/bitcoins/core/number/UInt8Spec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/UInt8Spec.scala rename to core-test/src/test/scala/org/bitcoins/core/number/UInt8Spec.scala diff --git a/src/test/scala/org/bitcoins/core/number/UInt8Test.scala b/core-test/src/test/scala/org/bitcoins/core/number/UInt8Test.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/number/UInt8Test.scala rename to core-test/src/test/scala/org/bitcoins/core/number/UInt8Test.scala diff --git a/src/test/scala/org/bitcoins/core/policy/PolicyTest.scala b/core-test/src/test/scala/org/bitcoins/core/policy/PolicyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/policy/PolicyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/policy/PolicyTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/AddressFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/AddressFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/AddressFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/AddressFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/AddressTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/AddressTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/AddressTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/AddressTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/Bech32Spec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/Bech32Spec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/Bech32Spec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/Bech32Spec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/Bech32Test.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/Bech32Test.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/Bech32Test.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/Bech32Test.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/BitcoinAddressSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/BitcoinAddressSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/BitcoinAddressSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/BitcoinAddressSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/BitcoinAddressTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/BitcoinAddressTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/BitcoinAddressTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/BitcoinAddressTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/CompactSizeUIntSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/CompactSizeUIntSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/CompactSizeUIntSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/CompactSizeUIntSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/CompactSizeUIntTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/CompactSizeUIntTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/CompactSizeUIntTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/CompactSizeUIntTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/blockchain/BlockHeaderSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/BlockHeaderSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/blockchain/BlockHeaderSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/BlockHeaderSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/blockchain/BlockTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/BlockTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/blockchain/BlockTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/BlockTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/blockchain/ChainParamsTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/ChainParamsTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/blockchain/ChainParamsTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/ChainParamsTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockTests.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockTests.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockTests.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/MerkleBlockTests.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeTests.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeTests.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeTests.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTreeTests.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeySpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeySpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeySpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/CLTVScriptPubKeyTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeySpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeySpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeySpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/CSVScriptPubKeyTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeySpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeySpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeySpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptPubKeyTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/MultiSignatureScriptSignatureTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeySpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeySpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeySpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptPubKeyTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKHScriptSignatureTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeySpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeySpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeySpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptPubKeyTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2PKScriptSignatureTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptPubKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptPubKeySpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptPubKeySpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptPubKeySpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/P2SHScriptSignatureTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptPubKeyTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/ScriptSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/ScriptSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/ScriptWitnessSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptWitnessSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/ScriptWitnessSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/ScriptWitnessSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/WitnessCommitmentTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/WitnessScriptPubKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/WitnessScriptPubKeySpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/WitnessScriptPubKeySpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/WitnessScriptPubKeySpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/script/testprotocol/SignatureHashTestCase.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/script/testprotocol/SignatureHashTestCase.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/script/testprotocol/SignatureHashTestCase.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/script/testprotocol/SignatureHashTestCase.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionInputTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutPointTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionOutputTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionWitnessSpec.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionWitnessSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/TransactionWitnessSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionWitnessSpec.scala diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/testprotocol/CoreTransactionTestCase.scala b/core-test/src/test/scala/org/bitcoins/core/protocol/transaction/testprotocol/CoreTransactionTestCase.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/protocol/transaction/testprotocol/CoreTransactionTestCase.scala rename to core-test/src/test/scala/org/bitcoins/core/protocol/transaction/testprotocol/CoreTransactionTestCase.scala diff --git a/src/test/scala/org/bitcoins/core/script/ScriptConstantFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/ScriptConstantFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/ScriptConstantFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/ScriptConstantFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/ScriptOperationFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/ScriptOperationFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/ScriptOperationFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/ScriptOperationFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/ScriptProgramFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/ScriptProgramFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/ScriptProgramFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/ScriptProgramFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/ScriptProgramTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/ScriptProgramTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/ScriptProgramTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/ScriptProgramTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperationsTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/bitwise/BitwiseOperationsTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/constant/BytesToPushOntoStackFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/constant/BytesToPushOntoStackFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/constant/BytesToPushOntoStackFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/constant/BytesToPushOntoStackFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/constant/ConstantInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/constant/ConstantInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/constant/ConstantInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/constant/ConstantInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/constant/ConstantsTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/constant/ConstantsTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/constant/ConstantsTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/constant/ConstantsTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/constant/ScriptNumberFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberSpec.scala b/core-test/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/constant/ScriptNumberSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberSpec.scala diff --git a/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/constant/ScriptNumberTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberUtilTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberUtilTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/constant/ScriptNumberUtilTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/constant/ScriptNumberUtilTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/control/ControlOperationsFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/control/ControlOperationsFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/control/ControlOperationsFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/control/ControlOperationsFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/control/ControlOperationsTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/control/ControlOperationsTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/control/ControlOperationsTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/control/ControlOperationsTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/crypto/CryptoInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/crypto/CryptoInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/crypto/CryptoInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/crypto/CryptoInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/crypto/CryptoOperationsTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/crypto/HashTypeTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/crypto/HashTypeTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/crypto/HashTypeTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/crypto/HashTypeTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/flag/ScriptFlagFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagUtilTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagUtilTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/flag/ScriptFlagUtilTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagUtilTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagsTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagsTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/flag/ScriptFlagsTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/flag/ScriptFlagsTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/interpreter/ScriptInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/interpreter/ScriptInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/interpreter/ScriptInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/interpreter/ScriptInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/interpreter/script_invalid.json b/core-test/src/test/scala/org/bitcoins/core/script/interpreter/script_invalid.json similarity index 100% rename from src/test/scala/org/bitcoins/core/script/interpreter/script_invalid.json rename to core-test/src/test/scala/org/bitcoins/core/script/interpreter/script_invalid.json diff --git a/src/test/scala/org/bitcoins/core/script/interpreter/script_valid.json b/core-test/src/test/scala/org/bitcoins/core/script/interpreter/script_valid.json similarity index 100% rename from src/test/scala/org/bitcoins/core/script/interpreter/script_valid.json rename to core-test/src/test/scala/org/bitcoins/core/script/interpreter/script_valid.json diff --git a/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/CoreTestCase.scala b/core-test/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/CoreTestCase.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/CoreTestCase.scala rename to core-test/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/CoreTestCase.scala diff --git a/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptPubKeyCoreTestCase.scala b/core-test/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptPubKeyCoreTestCase.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptPubKeyCoreTestCase.scala rename to core-test/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptPubKeyCoreTestCase.scala diff --git a/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptSignatureCoreTestCase.scala b/core-test/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptSignatureCoreTestCase.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptSignatureCoreTestCase.scala rename to core-test/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/ScriptSignatureCoreTestCase.scala diff --git a/src/test/scala/org/bitcoins/core/script/locktime/LockTimeInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/locktime/LockTimeInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/locktime/LockTimeInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/locktime/LockTimeInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/locktime/LocktimeOperationTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/reserved/ReservedOperationsFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/reserved/ReservedOperationsFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/reserved/ReservedOperationsFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/reserved/ReservedOperationsFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/splice/SpliceInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/splice/SpliceInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/splice/SpliceInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/splice/SpliceInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/splice/SpliceOperationFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/splice/SpliceOperationFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/splice/SpliceOperationFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/splice/SpliceOperationFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/stack/StackInterpreterTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/stack/StackInterpreterTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/stack/StackInterpreterTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/stack/StackInterpreterTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/stack/StackOperationFactoryTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/stack/StackOperationFactoryTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/stack/StackOperationFactoryTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/stack/StackOperationFactoryTest.scala diff --git a/src/test/scala/org/bitcoins/core/script/stack/StackOperationsTest.scala b/core-test/src/test/scala/org/bitcoins/core/script/stack/StackOperationsTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/script/stack/StackOperationsTest.scala rename to core-test/src/test/scala/org/bitcoins/core/script/stack/StackOperationsTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/RawSatoshisSerializerSpec.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/RawSatoshisSerializerSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/RawSatoshisSerializerSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/RawSatoshisSerializerSpec.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/RawSerializerHelperSpec.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/RawSerializerHelperSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/RawSerializerHelperSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/RawSerializerHelperSpec.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializerTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializerTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializerTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializerTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializerTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializerTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializerTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializerTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializerTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializerTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializerTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializerTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/transaction/RawBaseTransactionParserTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawBaseTransactionParserTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/transaction/RawBaseTransactionParserTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawBaseTransactionParserTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala diff --git a/src/test/scala/org/bitcoins/core/serializers/transaction/RawWitnessTransactionParserTest.scala b/core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawWitnessTransactionParserTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/serializers/transaction/RawWitnessTransactionParserTest.scala rename to core-test/src/test/scala/org/bitcoins/core/serializers/transaction/RawWitnessTransactionParserTest.scala diff --git a/src/test/scala/org/bitcoins/core/util/Base58Test.scala b/core-test/src/test/scala/org/bitcoins/core/util/Base58Test.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/Base58Test.scala rename to core-test/src/test/scala/org/bitcoins/core/util/Base58Test.scala diff --git a/src/test/scala/org/bitcoins/core/util/BinaryTreeTest.scala b/core-test/src/test/scala/org/bitcoins/core/util/BinaryTreeTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/BinaryTreeTest.scala rename to core-test/src/test/scala/org/bitcoins/core/util/BinaryTreeTest.scala diff --git a/src/test/scala/org/bitcoins/core/util/BitcoinSUtilSpec.scala b/core-test/src/test/scala/org/bitcoins/core/util/BitcoinSUtilSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/BitcoinSUtilSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/util/BitcoinSUtilSpec.scala diff --git a/src/test/scala/org/bitcoins/core/util/BitcoinSUtilTest.scala b/core-test/src/test/scala/org/bitcoins/core/util/BitcoinSUtilTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/BitcoinSUtilTest.scala rename to core-test/src/test/scala/org/bitcoins/core/util/BitcoinSUtilTest.scala diff --git a/src/test/scala/org/bitcoins/core/util/BitcoinScriptUtilTest.scala b/core-test/src/test/scala/org/bitcoins/core/util/BitcoinScriptUtilTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/BitcoinScriptUtilTest.scala rename to core-test/src/test/scala/org/bitcoins/core/util/BitcoinScriptUtilTest.scala diff --git a/src/test/scala/org/bitcoins/core/util/CryptoTestUtil.scala b/core-test/src/test/scala/org/bitcoins/core/util/CryptoTestUtil.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/CryptoTestUtil.scala rename to core-test/src/test/scala/org/bitcoins/core/util/CryptoTestUtil.scala diff --git a/src/test/scala/org/bitcoins/core/util/CryptoUtilTest.scala b/core-test/src/test/scala/org/bitcoins/core/util/CryptoUtilTest.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/CryptoUtilTest.scala rename to core-test/src/test/scala/org/bitcoins/core/util/CryptoUtilTest.scala diff --git a/src/test/scala/org/bitcoins/core/util/NumberUtilSpec.scala b/core-test/src/test/scala/org/bitcoins/core/util/NumberUtilSpec.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/NumberUtilSpec.scala rename to core-test/src/test/scala/org/bitcoins/core/util/NumberUtilSpec.scala diff --git a/src/test/scala/org/bitcoins/core/util/ScriptProgramTestUtil.scala b/core-test/src/test/scala/org/bitcoins/core/util/ScriptProgramTestUtil.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/ScriptProgramTestUtil.scala rename to core-test/src/test/scala/org/bitcoins/core/util/ScriptProgramTestUtil.scala diff --git a/src/test/scala/org/bitcoins/core/util/TestUtil.scala b/core-test/src/test/scala/org/bitcoins/core/util/TestUtil.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/TestUtil.scala rename to core-test/src/test/scala/org/bitcoins/core/util/TestUtil.scala diff --git a/src/test/scala/org/bitcoins/core/util/TransactionTestUtil.scala b/core-test/src/test/scala/org/bitcoins/core/util/TransactionTestUtil.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/TransactionTestUtil.scala rename to core-test/src/test/scala/org/bitcoins/core/util/TransactionTestUtil.scala diff --git a/src/test/scala/org/bitcoins/core/util/testprotocol/Base58InvalidTestCase.scala b/core-test/src/test/scala/org/bitcoins/core/util/testprotocol/Base58InvalidTestCase.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/testprotocol/Base58InvalidTestCase.scala rename to core-test/src/test/scala/org/bitcoins/core/util/testprotocol/Base58InvalidTestCase.scala diff --git a/src/test/scala/org/bitcoins/core/util/testprotocol/Base58ValidTestCase.scala b/core-test/src/test/scala/org/bitcoins/core/util/testprotocol/Base58ValidTestCase.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/testprotocol/Base58ValidTestCase.scala rename to core-test/src/test/scala/org/bitcoins/core/util/testprotocol/Base58ValidTestCase.scala diff --git a/src/test/scala/org/bitcoins/core/util/testprotocol/ConfigParams.scala b/core-test/src/test/scala/org/bitcoins/core/util/testprotocol/ConfigParams.scala similarity index 100% rename from src/test/scala/org/bitcoins/core/util/testprotocol/ConfigParams.scala rename to core-test/src/test/scala/org/bitcoins/core/util/testprotocol/ConfigParams.scala diff --git a/core/build.sbt b/core/build.sbt new file mode 100644 index 0000000000..a17c44fc8c --- /dev/null +++ b/core/build.sbt @@ -0,0 +1,20 @@ + +name := "bitcoin-s-core" + +libraryDependencies ++= Deps.core + +testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "2") + +//test in assembly := {} + +//testOptions in Test += Tests.Argument("-oF") + +//parallelExecution in Test := false + +coverageExcludedPackages := ".*gen" + +coverageMinimum := 90 + +coverageFailOnMinimum := true + +assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false) diff --git a/src/main/scala/org/bitcoins/core/bloom/BloomFilter.scala b/core/src/main/scala/org/bitcoins/core/bloom/BloomFilter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/bloom/BloomFilter.scala rename to core/src/main/scala/org/bitcoins/core/bloom/BloomFilter.scala diff --git a/src/main/scala/org/bitcoins/core/bloom/BloomFlag.scala b/core/src/main/scala/org/bitcoins/core/bloom/BloomFlag.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/bloom/BloomFlag.scala rename to core/src/main/scala/org/bitcoins/core/bloom/BloomFlag.scala diff --git a/src/main/scala/org/bitcoins/core/config/NetworkParameters.scala b/core/src/main/scala/org/bitcoins/core/config/NetworkParameters.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/config/NetworkParameters.scala rename to core/src/main/scala/org/bitcoins/core/config/NetworkParameters.scala diff --git a/src/main/scala/org/bitcoins/core/consensus/Consensus.scala b/core/src/main/scala/org/bitcoins/core/consensus/Consensus.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/consensus/Consensus.scala rename to core/src/main/scala/org/bitcoins/core/consensus/Consensus.scala diff --git a/src/main/scala/org/bitcoins/core/consensus/Merkle.scala b/core/src/main/scala/org/bitcoins/core/consensus/Merkle.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/consensus/Merkle.scala rename to core/src/main/scala/org/bitcoins/core/consensus/Merkle.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/ChainCode.scala b/core/src/main/scala/org/bitcoins/core/crypto/ChainCode.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/ChainCode.scala rename to core/src/main/scala/org/bitcoins/core/crypto/ChainCode.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/CryptoParams.scala b/core/src/main/scala/org/bitcoins/core/crypto/CryptoParams.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/CryptoParams.scala rename to core/src/main/scala/org/bitcoins/core/crypto/CryptoParams.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/DERSignatureUtil.scala b/core/src/main/scala/org/bitcoins/core/crypto/DERSignatureUtil.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/DERSignatureUtil.scala rename to core/src/main/scala/org/bitcoins/core/crypto/DERSignatureUtil.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/ECDigitalSignature.scala b/core/src/main/scala/org/bitcoins/core/crypto/ECDigitalSignature.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/ECDigitalSignature.scala rename to core/src/main/scala/org/bitcoins/core/crypto/ECDigitalSignature.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/ECKey.scala b/core/src/main/scala/org/bitcoins/core/crypto/ECKey.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/ECKey.scala rename to core/src/main/scala/org/bitcoins/core/crypto/ECKey.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/ExtKey.scala b/core/src/main/scala/org/bitcoins/core/crypto/ExtKey.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/ExtKey.scala rename to core/src/main/scala/org/bitcoins/core/crypto/ExtKey.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/ExtKeyVersion.scala b/core/src/main/scala/org/bitcoins/core/crypto/ExtKeyVersion.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/ExtKeyVersion.scala rename to core/src/main/scala/org/bitcoins/core/crypto/ExtKeyVersion.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/HashDigest.scala b/core/src/main/scala/org/bitcoins/core/crypto/HashDigest.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/HashDigest.scala rename to core/src/main/scala/org/bitcoins/core/crypto/HashDigest.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/Sign.scala b/core/src/main/scala/org/bitcoins/core/crypto/Sign.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/Sign.scala rename to core/src/main/scala/org/bitcoins/core/crypto/Sign.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala b/core/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala rename to core/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResult.scala b/core/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResult.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResult.scala rename to core/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureCheckerResult.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureCreator.scala b/core/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureCreator.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/TransactionSignatureCreator.scala rename to core/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureCreator.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala b/core/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala rename to core/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala diff --git a/src/main/scala/org/bitcoins/core/crypto/TxSigComponent.scala b/core/src/main/scala/org/bitcoins/core/crypto/TxSigComponent.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/crypto/TxSigComponent.scala rename to core/src/main/scala/org/bitcoins/core/crypto/TxSigComponent.scala diff --git a/src/main/scala/org/bitcoins/core/currency/CurrencyUnits.scala b/core/src/main/scala/org/bitcoins/core/currency/CurrencyUnits.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/currency/CurrencyUnits.scala rename to core/src/main/scala/org/bitcoins/core/currency/CurrencyUnits.scala diff --git a/src/main/scala/org/bitcoins/core/number/NumberType.scala b/core/src/main/scala/org/bitcoins/core/number/NumberType.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/number/NumberType.scala rename to core/src/main/scala/org/bitcoins/core/number/NumberType.scala diff --git a/src/main/scala/org/bitcoins/core/policy/Policy.scala b/core/src/main/scala/org/bitcoins/core/policy/Policy.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/policy/Policy.scala rename to core/src/main/scala/org/bitcoins/core/policy/Policy.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/Address.scala b/core/src/main/scala/org/bitcoins/core/protocol/Address.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/Address.scala rename to core/src/main/scala/org/bitcoins/core/protocol/Address.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/CompactSizeUInt.scala b/core/src/main/scala/org/bitcoins/core/protocol/CompactSizeUInt.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/CompactSizeUInt.scala rename to core/src/main/scala/org/bitcoins/core/protocol/CompactSizeUInt.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/NetworkElement.scala b/core/src/main/scala/org/bitcoins/core/protocol/NetworkElement.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/NetworkElement.scala rename to core/src/main/scala/org/bitcoins/core/protocol/NetworkElement.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/blockchain/Block.scala b/core/src/main/scala/org/bitcoins/core/protocol/blockchain/Block.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/blockchain/Block.scala rename to core/src/main/scala/org/bitcoins/core/protocol/blockchain/Block.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/blockchain/BlockHeader.scala b/core/src/main/scala/org/bitcoins/core/protocol/blockchain/BlockHeader.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/blockchain/BlockHeader.scala rename to core/src/main/scala/org/bitcoins/core/protocol/blockchain/BlockHeader.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/blockchain/ChainParams.scala b/core/src/main/scala/org/bitcoins/core/protocol/blockchain/ChainParams.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/blockchain/ChainParams.scala rename to core/src/main/scala/org/bitcoins/core/protocol/blockchain/ChainParams.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/blockchain/MerkleBlock.scala b/core/src/main/scala/org/bitcoins/core/protocol/blockchain/MerkleBlock.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/blockchain/MerkleBlock.scala rename to core/src/main/scala/org/bitcoins/core/protocol/blockchain/MerkleBlock.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTree.scala b/core/src/main/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTree.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTree.scala rename to core/src/main/scala/org/bitcoins/core/protocol/blockchain/PartialMerkleTree.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptFactory.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/ScriptFactory.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/script/ScriptFactory.scala rename to core/src/main/scala/org/bitcoins/core/protocol/script/ScriptFactory.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala rename to core/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala rename to core/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala rename to core/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala rename to core/src/main/scala/org/bitcoins/core/protocol/script/ScriptWitness.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/script/SignatureVersion.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/SignatureVersion.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/script/SignatureVersion.scala rename to core/src/main/scala/org/bitcoins/core/protocol/script/SignatureVersion.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/script/WitnessVersion.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/WitnessVersion.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/script/WitnessVersion.scala rename to core/src/main/scala/org/bitcoins/core/protocol/script/WitnessVersion.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala b/core/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala rename to core/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionConstants.scala b/core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionConstants.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/transaction/TransactionConstants.scala rename to core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionConstants.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala b/core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala rename to core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala b/core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala rename to core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala b/core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala rename to core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala b/core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala rename to core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala b/core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala rename to core/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionWitness.scala diff --git a/src/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala b/core/src/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala rename to core/src/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala diff --git a/src/main/scala/org/bitcoins/core/script/ScriptProgram.scala b/core/src/main/scala/org/bitcoins/core/script/ScriptProgram.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/ScriptProgram.scala rename to core/src/main/scala/org/bitcoins/core/script/ScriptProgram.scala diff --git a/src/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperations.scala b/core/src/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperations.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperations.scala rename to core/src/main/scala/org/bitcoins/core/script/arithmetic/ArithmeticOperations.scala diff --git a/src/main/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/bitwise/BitwiseInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/bitwise/BitwiseOperations.scala b/core/src/main/scala/org/bitcoins/core/script/bitwise/BitwiseOperations.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/bitwise/BitwiseOperations.scala rename to core/src/main/scala/org/bitcoins/core/script/bitwise/BitwiseOperations.scala diff --git a/src/main/scala/org/bitcoins/core/script/constant/BytesToPushOntoStack.scala b/core/src/main/scala/org/bitcoins/core/script/constant/BytesToPushOntoStack.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/constant/BytesToPushOntoStack.scala rename to core/src/main/scala/org/bitcoins/core/script/constant/BytesToPushOntoStack.scala diff --git a/src/main/scala/org/bitcoins/core/script/constant/ConstantInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/constant/ConstantInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/constant/ConstantInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/constant/ConstantInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/constant/Constants.scala b/core/src/main/scala/org/bitcoins/core/script/constant/Constants.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/constant/Constants.scala rename to core/src/main/scala/org/bitcoins/core/script/constant/Constants.scala diff --git a/src/main/scala/org/bitcoins/core/script/constant/ScriptNumberUtil.scala b/core/src/main/scala/org/bitcoins/core/script/constant/ScriptNumberUtil.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/constant/ScriptNumberUtil.scala rename to core/src/main/scala/org/bitcoins/core/script/constant/ScriptNumberUtil.scala diff --git a/src/main/scala/org/bitcoins/core/script/constant/StackPushOperationFactory.scala b/core/src/main/scala/org/bitcoins/core/script/constant/StackPushOperationFactory.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/constant/StackPushOperationFactory.scala rename to core/src/main/scala/org/bitcoins/core/script/constant/StackPushOperationFactory.scala diff --git a/src/main/scala/org/bitcoins/core/script/control/ControlOperations.scala b/core/src/main/scala/org/bitcoins/core/script/control/ControlOperations.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/control/ControlOperations.scala rename to core/src/main/scala/org/bitcoins/core/script/control/ControlOperations.scala diff --git a/src/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/crypto/CryptoInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/crypto/CryptoInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/crypto/CryptoInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/crypto/CryptoInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/crypto/CryptoOperations.scala b/core/src/main/scala/org/bitcoins/core/script/crypto/CryptoOperations.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/crypto/CryptoOperations.scala rename to core/src/main/scala/org/bitcoins/core/script/crypto/CryptoOperations.scala diff --git a/src/main/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactory.scala b/core/src/main/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactory.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactory.scala rename to core/src/main/scala/org/bitcoins/core/script/crypto/CryptoSignatureEvaluationFactory.scala diff --git a/src/main/scala/org/bitcoins/core/script/crypto/HashType.scala b/core/src/main/scala/org/bitcoins/core/script/crypto/HashType.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/crypto/HashType.scala rename to core/src/main/scala/org/bitcoins/core/script/crypto/HashType.scala diff --git a/src/main/scala/org/bitcoins/core/script/flag/ScriptFlagFactory.scala b/core/src/main/scala/org/bitcoins/core/script/flag/ScriptFlagFactory.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/flag/ScriptFlagFactory.scala rename to core/src/main/scala/org/bitcoins/core/script/flag/ScriptFlagFactory.scala diff --git a/src/main/scala/org/bitcoins/core/script/flag/ScriptFlagUtil.scala b/core/src/main/scala/org/bitcoins/core/script/flag/ScriptFlagUtil.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/flag/ScriptFlagUtil.scala rename to core/src/main/scala/org/bitcoins/core/script/flag/ScriptFlagUtil.scala diff --git a/src/main/scala/org/bitcoins/core/script/flag/ScriptFlags.scala b/core/src/main/scala/org/bitcoins/core/script/flag/ScriptFlags.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/flag/ScriptFlags.scala rename to core/src/main/scala/org/bitcoins/core/script/flag/ScriptFlags.scala diff --git a/src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/locktime/LockTimeInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/locktime/LockTimeInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/locktime/LockTimeInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/locktime/LockTimeInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/locktime/LocktimeOperations.scala b/core/src/main/scala/org/bitcoins/core/script/locktime/LocktimeOperations.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/locktime/LocktimeOperations.scala rename to core/src/main/scala/org/bitcoins/core/script/locktime/LocktimeOperations.scala diff --git a/src/main/scala/org/bitcoins/core/script/reserved/ReservedOperations.scala b/core/src/main/scala/org/bitcoins/core/script/reserved/ReservedOperations.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/reserved/ReservedOperations.scala rename to core/src/main/scala/org/bitcoins/core/script/reserved/ReservedOperations.scala diff --git a/src/main/scala/org/bitcoins/core/script/result/ScriptResult.scala b/core/src/main/scala/org/bitcoins/core/script/result/ScriptResult.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/result/ScriptResult.scala rename to core/src/main/scala/org/bitcoins/core/script/result/ScriptResult.scala diff --git a/src/main/scala/org/bitcoins/core/script/splice/SpliceInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/splice/SpliceInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/splice/SpliceInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/splice/SpliceInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/splice/SpliceOperations.scala b/core/src/main/scala/org/bitcoins/core/script/splice/SpliceOperations.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/splice/SpliceOperations.scala rename to core/src/main/scala/org/bitcoins/core/script/splice/SpliceOperations.scala diff --git a/src/main/scala/org/bitcoins/core/script/stack/StackInterpreter.scala b/core/src/main/scala/org/bitcoins/core/script/stack/StackInterpreter.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/stack/StackInterpreter.scala rename to core/src/main/scala/org/bitcoins/core/script/stack/StackInterpreter.scala diff --git a/src/main/scala/org/bitcoins/core/script/stack/StackOperations.scala b/core/src/main/scala/org/bitcoins/core/script/stack/StackOperations.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/script/stack/StackOperations.scala rename to core/src/main/scala/org/bitcoins/core/script/stack/StackOperations.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala rename to core/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala b/core/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala rename to core/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/RawSatoshisSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/RawSatoshisSerializer.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/RawSatoshisSerializer.scala rename to core/src/main/scala/org/bitcoins/core/serializers/RawSatoshisSerializer.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializer.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializer.scala rename to core/src/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockHeaderSerializer.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializer.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializer.scala rename to core/src/main/scala/org/bitcoins/core/serializers/blockchain/RawBlockSerializer.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializer.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializer.scala rename to core/src/main/scala/org/bitcoins/core/serializers/blockchain/RawMerkleBlockSerializer.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/bloom/RawBloomFilterSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/bloom/RawBloomFilterSerializer.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/bloom/RawBloomFilterSerializer.scala rename to core/src/main/scala/org/bitcoins/core/serializers/bloom/RawBloomFilterSerializer.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala b/core/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala rename to core/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala b/core/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala rename to core/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/script/RawScriptWitnessParser.scala b/core/src/main/scala/org/bitcoins/core/serializers/script/RawScriptWitnessParser.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/script/RawScriptWitnessParser.scala rename to core/src/main/scala/org/bitcoins/core/serializers/script/RawScriptWitnessParser.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala b/core/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala rename to core/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala b/core/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala rename to core/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala b/core/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala rename to core/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala b/core/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala rename to core/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala diff --git a/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionWitnessParser.scala b/core/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionWitnessParser.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionWitnessParser.scala rename to core/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionWitnessParser.scala diff --git a/src/main/scala/org/bitcoins/core/util/Base58.scala b/core/src/main/scala/org/bitcoins/core/util/Base58.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/util/Base58.scala rename to core/src/main/scala/org/bitcoins/core/util/Base58.scala diff --git a/src/main/scala/org/bitcoins/core/util/BinaryTree.scala b/core/src/main/scala/org/bitcoins/core/util/BinaryTree.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/util/BinaryTree.scala rename to core/src/main/scala/org/bitcoins/core/util/BinaryTree.scala diff --git a/src/main/scala/org/bitcoins/core/util/BitcoinSUtil.scala b/core/src/main/scala/org/bitcoins/core/util/BitcoinSUtil.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/util/BitcoinSUtil.scala rename to core/src/main/scala/org/bitcoins/core/util/BitcoinSUtil.scala diff --git a/src/main/scala/org/bitcoins/core/util/BitcoinScriptUtil.scala b/core/src/main/scala/org/bitcoins/core/util/BitcoinScriptUtil.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/util/BitcoinScriptUtil.scala rename to core/src/main/scala/org/bitcoins/core/util/BitcoinScriptUtil.scala diff --git a/src/main/scala/org/bitcoins/core/util/CryptoUtil.scala b/core/src/main/scala/org/bitcoins/core/util/CryptoUtil.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/util/CryptoUtil.scala rename to core/src/main/scala/org/bitcoins/core/util/CryptoUtil.scala diff --git a/src/main/scala/org/bitcoins/core/util/Factory.scala b/core/src/main/scala/org/bitcoins/core/util/Factory.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/util/Factory.scala rename to core/src/main/scala/org/bitcoins/core/util/Factory.scala diff --git a/src/main/scala/org/bitcoins/core/util/NumberUtil.scala b/core/src/main/scala/org/bitcoins/core/util/NumberUtil.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/util/NumberUtil.scala rename to core/src/main/scala/org/bitcoins/core/util/NumberUtil.scala diff --git a/src/main/scala/org/bitcoins/core/wallet/builder/TxBuilderError.scala b/core/src/main/scala/org/bitcoins/core/wallet/builder/TxBuilderError.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/wallet/builder/TxBuilderError.scala rename to core/src/main/scala/org/bitcoins/core/wallet/builder/TxBuilderError.scala diff --git a/src/main/scala/org/bitcoins/core/wallet/fee/FeeUnit.scala b/core/src/main/scala/org/bitcoins/core/wallet/fee/FeeUnit.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/wallet/fee/FeeUnit.scala rename to core/src/main/scala/org/bitcoins/core/wallet/fee/FeeUnit.scala diff --git a/src/main/scala/org/bitcoins/core/wallet/signer/FundingInfo.scala b/core/src/main/scala/org/bitcoins/core/wallet/signer/FundingInfo.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/wallet/signer/FundingInfo.scala rename to core/src/main/scala/org/bitcoins/core/wallet/signer/FundingInfo.scala diff --git a/src/main/scala/org/bitcoins/core/wallet/signer/Signer.scala b/core/src/main/scala/org/bitcoins/core/wallet/signer/Signer.scala similarity index 100% rename from src/main/scala/org/bitcoins/core/wallet/signer/Signer.scala rename to core/src/main/scala/org/bitcoins/core/wallet/signer/Signer.scala diff --git a/inThisBuild.sbt b/inThisBuild.sbt new file mode 100644 index 0000000000..d68506b6c5 --- /dev/null +++ b/inThisBuild.sbt @@ -0,0 +1,6 @@ + +scalaVersion in ThisBuild := "2.11.7" + +scalacOptions in ThisBuild ++= Seq("-Xmax-classfile-name", "140") + +organization in ThisBuild := "org.bitcoins" diff --git a/project/Deps.scala b/project/Deps.scala index ecb374ef6c..17073e528b 100644 --- a/project/Deps.scala +++ b/project/Deps.scala @@ -1,36 +1,54 @@ import sbt._ - object Deps { -lazy val scalaV = "2.11.7" -lazy val slf4jV = "1.7.5" -lazy val logbackV = "1.0.13" -lazy val scalaTestV = "3.0.5" -lazy val scalacheckV = "1.13.0" -lazy val sprayV = "1.3.2" -lazy val bouncyCastleV = "1.55" -lazy val zeromqV = "0.4.3" + object V { + val bouncyCastle = "1.55" + val logback = "1.0.13" + val scalacheck = "1.13.4" + val scalaTest = "3.0.5" + val slf4j = "1.7.5" + val spray = "1.3.2" + val zeromq = "0.4.3" + } -lazy val root = Seq( - "org.scalatest" %% "scalatest" % scalaTestV % "test", - "com.novocode" % "junit-interface" % "0.10" % "test", - "org.scalacheck" %% "scalacheck" % scalacheckV withSources() withJavadoc(), + object Compile { + val bouncycastle = "org.bouncycastle" % "bcprov-jdk15on" % V.bouncyCastle + val slf4j = "org.slf4j" % "slf4j-api" % V.slf4j % "provided" + val zeromq = "org.zeromq" % "jeromq" % V.zeromq + } - ("org.bitcoinj" % "bitcoinj-core" % "0.14.4" % "test").exclude("org.slf4j", "slf4j-api"), - "org.bouncycastle" % "bcprov-jdk15on" % bouncyCastleV, + object Test { + val bitcoinj = ("org.bitcoinj" % "bitcoinj-core" % "0.14.4" % "test").exclude("org.slf4j", "slf4j-api") + val junitInterface = "com.novocode" % "junit-interface" % "0.10" % "test" + val logback = "ch.qos.logback" % "logback-classic" % V.logback % "test" + val scalacheck = "org.scalacheck" %% "scalacheck" % V.scalacheck % "test" withSources() withJavadoc() + val scalaTest = "org.scalatest" %% "scalatest" % V.scalaTest % "test" + val spray = "io.spray" %% "spray-json" % V.spray % "test" + } - "org.slf4j" % "slf4j-api" % slf4jV % "provided", - "ch.qos.logback" % "logback-classic" % logbackV, + val core = List( + Compile.bouncycastle, + Compile.slf4j + ) - "io.spray" %% "spray-json" % sprayV % "test" -) + val coreGen = List( + Compile.slf4j, + Test.scalacheck + ) -lazy val zmq = Seq( - "org.scalatest" %% "scalatest" % scalaTestV % "test", - "org.scalacheck" %% "scalacheck" % scalacheckV withSources() withJavadoc(), - "org.zeromq" % "jeromq" % zeromqV, - "org.slf4j" % "slf4j-api" % slf4jV % "provided", - "ch.qos.logback" % "logback-classic" % logbackV -) + val coreTest = List( + Test.bitcoinj, + Test.junitInterface, + Test.logback, + Test.scalaTest, + Test.spray + ) + val zmq = List( + Compile.zeromq, + Compile.slf4j, + Test.logback, + Test.scalacheck, + Test.scalaTest + ) } diff --git a/secp256k1jni/build.sbt b/secp256k1jni/build.sbt new file mode 100644 index 0000000000..cd2f5faff2 --- /dev/null +++ b/secp256k1jni/build.sbt @@ -0,0 +1,9 @@ + +name := "secp256k1jni" + +// TODO: we may want to override the version and publish separately +// version := "0.0.1" + +autoScalaLibrary := false // exclude scala-library from dependencies + +crossPaths := false // drop off Scala suffix from artifact names. diff --git a/src/main/java/org/bitcoin/NativeSecp256k1.java b/secp256k1jni/src/main/java/org/bitcoin/NativeSecp256k1.java similarity index 100% rename from src/main/java/org/bitcoin/NativeSecp256k1.java rename to secp256k1jni/src/main/java/org/bitcoin/NativeSecp256k1.java diff --git a/src/main/java/org/bitcoin/NativeSecp256k1Util.java b/secp256k1jni/src/main/java/org/bitcoin/NativeSecp256k1Util.java similarity index 100% rename from src/main/java/org/bitcoin/NativeSecp256k1Util.java rename to secp256k1jni/src/main/java/org/bitcoin/NativeSecp256k1Util.java diff --git a/src/main/java/org/bitcoin/Secp256k1Context.java b/secp256k1jni/src/main/java/org/bitcoin/Secp256k1Context.java similarity index 100% rename from src/main/java/org/bitcoin/Secp256k1Context.java rename to secp256k1jni/src/main/java/org/bitcoin/Secp256k1Context.java diff --git a/src/test/scala/org/bitcoins/core/crypto/ECPrivateKeyTest.scala b/src/test/scala/org/bitcoins/core/crypto/ECPrivateKeyTest.scala deleted file mode 100644 index deaadf90ae..0000000000 --- a/src/test/scala/org/bitcoins/core/crypto/ECPrivateKeyTest.scala +++ /dev/null @@ -1,99 +0,0 @@ -package org.bitcoins.core.crypto - -import org.bitcoins.core.config.TestNet3 -import org.bitcoins.core.util.{ BitcoinJTestUtil, BitcoinSLogger, BitcoinSUtil, CryptoTestUtil } -import org.scalatest.{ FlatSpec, MustMatchers } - -/** - * Created by chris on 3/7/16. - */ -class ECPrivateKeyTest extends FlatSpec with MustMatchers { - private def logger = BitcoinSLogger.logger - - "ECPrivateKey" must "have the same byte representation as a bitcoinj private key" in { - val bitcoinjPrivateKey = CryptoTestUtil.bitcoinjPrivateKey.getPrivateKeyAsHex - CryptoTestUtil.privateKey.hex must be(bitcoinjPrivateKey) - } - - it must "derive the same public from a private key as bitcoinj" in { - val bitcoinjPublicKeyBytes = CryptoTestUtil.bitcoinjPrivateKey.getPubKey - CryptoTestUtil.privateKey.publicKey.hex must be(BitcoinSUtil.encodeHex(bitcoinjPublicKeyBytes)) - } - - it must "create a bitcoin-s private key from a bitcoinj private key, then convert to the same public key" in { - val bitcoinjKey = new org.bitcoinj.core.ECKey() - val bitcoinsPrivKey = ECPrivateKey(bitcoinjKey.getSecretBytes) - val bitcoinsPublicKey = bitcoinsPrivKey.publicKey - val bitcoinjPublicKey = bitcoinjKey.getPubKey - - bitcoinsPublicKey.bytes must be(bitcoinjPublicKey) - } - - it must "create a bitcionj private key from a bitcoins private key and get the same public key" in { - val bitcoinsPrivKey = ECPrivateKey.freshPrivateKey - val bitcoinjPrivKey = org.bitcoinj.core.ECKey.fromPrivate(bitcoinsPrivKey.bytes.toArray) - val bitcoinjPublicKey = bitcoinjPrivKey.getPubKey - val bitcoinsPublicKey = bitcoinsPrivKey.publicKey - - bitcoinsPublicKey.bytes must be(bitcoinjPublicKey) - } - - it must "create a private key from the dumped base58 in bitcoin-cli" in { - val bitcoinjDumpedPrivateKey = CryptoTestUtil.bitcoinjDumpedPrivateKey - val bitcoinjPrivateKey = bitcoinjDumpedPrivateKey.getKey - val privateKey = ECPrivateKey.fromWIFToPrivateKey(CryptoTestUtil.privateKeyBase58) - privateKey.hex must be(bitcoinjPrivateKey.getPrivateKeyAsHex) - } - - it must "create a private key from a sequence of bytes that has the same byte representation of bitcoinj ECKeys" in { - val bitcoinJKey = CryptoTestUtil.bitcoinjPrivateKey - val privateKey: ECPrivateKey = ECPrivateKey(bitcoinJKey.getPrivKeyBytes) - privateKey.hex must be(bitcoinJKey.getPrivateKeyAsHex) - } - - it must "create a private key from its hex representation" in { - val privateKeyHex = "180cb41c7c600be951b5d3d0a7334acc7506173875834f7a6c4c786a28fcbb19" - val key: ECPrivateKey = ECPrivateKey(privateKeyHex) - key.hex must be(privateKeyHex) - } - - it must "determine if a private key corresponds to a compressed public key or not" in { - val compressedKey = "L1RrrnXkcKut5DEMwtDthjwRcTTwED36thyL1DebVrKuwvohjMNi" - val uncompressedKey = "93DVKyFYwSN6wEo3E2fCrFPUp17FtrtNi2Lf7n4G3garFb16CRj" - ECPrivateKey.isCompressed(compressedKey) must be(true) - ECPrivateKey.isCompressed(uncompressedKey) must be(false) - } - - it must "create a fresh private key" in { - ECPrivateKey() must not equal (ECPrivateKey()) - } - - it must "serialize a private key to WIF and then be able to deserialize it" in { - val hex = "2cecbfb72f8d5146d7fe7e5a3f80402c6dd688652c332dff2e44618d2d3372" - val privKey = ECPrivateKey(hex) - val wif = privKey.toWIF(TestNet3) - val privKeyFromWIF = ECPrivateKey.fromWIFToPrivateKey(wif) - privKeyFromWIF must be(privKey) - } - - it must "serialize a private key to WIF when the private key is prefixed with 0 bytes" in { - val hex = "00fc391adf4d6063a16a2e38b14d2be10133c4dacd4348b49d23ee0ce5ff4f1701" - val privKey = ECPrivateKey(hex) - val wif = privKey.toWIF(TestNet3) - val privKeyFromWIF = ECPrivateKey.fromWIFToPrivateKey(wif) - privKeyFromWIF must be(privKey) - } - - it must "correctly decode a private key from WIF" in { - val privateKey = ECPrivateKey.fromWIFToPrivateKey("cTPg4Zc5Jis2EZXy3NXShgbn487GWBTapbU63BerLDZM3w2hQSjC") - //derived hex on bitcore's playground - privateKey.hex must be("ad59fb6aadf617fb0f93469741fcd9a9f48700f1d1f465ddc0f26fa7f7bfa1ac") - } - - it must "decode a WIF private key corresponding to uncompressed public key" in { - val wif = "5Kg1gnAjaLfKiwhhPpGS3QfRg2m6awQvaj98JCZBZQ5SuS2F15C" - val privKey = ECPrivateKey.fromWIFToPrivateKey(wif) - privKey.publicKey.hex must be("045b81f0017e2091e2edcd5eecf10d5bdd120a5514cb3ee65b8447ec18bfc4575c6d5bf415e54e03b1067934a0f0ba76b01c6b9ab227142ee1d543764b69d901e0") - } - -}