From a14160a67a82fd064c38a3bfdf91df619218101a Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Thu, 19 May 2016 11:22:38 -0500 Subject: [PATCH 1/2] Changing the name of 'marshallers' package to 'serializers', renaming a few classes --- .../core/crypto/TransactionSignatureSerializer.scala | 4 ++-- .../bitcoins/core/protocol/script/ScriptPubKey.scala | 8 ++++---- .../core/protocol/script/ScriptPubKeyFactory.scala | 2 +- .../core/protocol/script/ScriptSignature.scala | 11 +++++------ .../core/protocol/transaction/Transaction.scala | 2 +- .../transaction/TransactionElement.scala | 4 ++-- .../protocol/transaction/TransactionFactory.scala | 2 +- .../core/protocol/transaction/TransactionInput.scala | 2 +- .../protocol/transaction/TransactionOutPoint.scala | 2 +- .../core/protocol/transaction/TransactionOutput.scala | 2 +- .../RawBitcoinSerializer.scala | 2 +- .../RawBitcoinSerializerHelper.scala | 2 +- .../script/RawScriptPubKeyParser.scala | 4 ++-- .../script/RawScriptSignatureParser.scala | 4 ++-- .../script/ScriptParser.scala | 2 +- .../transaction/RawTransactionInputParser.scala | 6 +++--- .../transaction/RawTransactionOutPointParser.scala | 4 ++-- .../transaction/RawTransactionOutputParser.scala | 6 +++--- .../crypto/TransactionSignatureSerializerTest.scala | 2 +- .../core/protocol/script/ScriptSignatureTest.scala | 2 +- .../core/protocol/transaction/TransactionTest.scala | 2 +- .../control/ControlOperationsInterpreterTest.scala | 2 +- .../script/RawScriptPubKeyParserTest.scala | 2 +- .../script/RawScriptSignatureParserTest.scala | 2 +- .../script/ScriptParserTest.scala | 2 +- .../transaction/RawTransactionInputParserTest.scala | 2 +- .../RawTransactionOutPointParserTest.scala | 2 +- .../transaction/RawTransactionOutputParserTest.scala | 2 +- .../transaction/RawTransactionParserTest.scala | 2 +- src/test/scala/org/bitcoins/core/util/TestUtil.scala | 4 ++-- 30 files changed, 47 insertions(+), 48 deletions(-) rename src/main/scala/org/bitcoins/core/{marshallers => protocol}/transaction/TransactionElement.scala (85%) rename src/main/scala/org/bitcoins/core/{marshallers => serializers}/RawBitcoinSerializer.scala (95%) rename src/main/scala/org/bitcoins/core/{marshallers => serializers}/RawBitcoinSerializerHelper.scala (96%) rename src/main/scala/org/bitcoins/core/{marshallers => serializers}/script/RawScriptPubKeyParser.scala (86%) rename src/main/scala/org/bitcoins/core/{marshallers => serializers}/script/RawScriptSignatureParser.scala (88%) rename src/main/scala/org/bitcoins/core/{marshallers => serializers}/script/ScriptParser.scala (99%) rename src/main/scala/org/bitcoins/core/{marshallers => serializers}/transaction/RawTransactionInputParser.scala (96%) rename src/main/scala/org/bitcoins/core/{marshallers => serializers}/transaction/RawTransactionOutPointParser.scala (90%) rename src/main/scala/org/bitcoins/core/{marshallers => serializers}/transaction/RawTransactionOutputParser.scala (95%) rename src/test/scala/org/bitcoins/core/{marshallers => serializers}/script/RawScriptPubKeyParserTest.scala (98%) rename src/test/scala/org/bitcoins/core/{marshallers => serializers}/script/RawScriptSignatureParserTest.scala (99%) rename src/test/scala/org/bitcoins/core/{marshallers => serializers}/script/ScriptParserTest.scala (99%) rename src/test/scala/org/bitcoins/core/{marshallers => serializers}/transaction/RawTransactionInputParserTest.scala (99%) rename src/test/scala/org/bitcoins/core/{marshallers => serializers}/transaction/RawTransactionOutPointParserTest.scala (97%) rename src/test/scala/org/bitcoins/core/{marshallers => serializers}/transaction/RawTransactionOutputParserTest.scala (98%) rename src/test/scala/org/bitcoins/core/{marshallers => serializers}/transaction/RawTransactionParserTest.scala (99%) diff --git a/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala b/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala index ce69207ed4..dfed990b89 100644 --- a/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala +++ b/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala @@ -1,8 +1,8 @@ package org.bitcoins.core.crypto import org.bitcoins.core.currency.CurrencyUnits -import org.bitcoins.core.marshallers.RawBitcoinSerializerHelper -import org.bitcoins.core.marshallers.transaction.RawTransactionOutputParser +import org.bitcoins.core.serializers.RawBitcoinSerializerHelper +import org.bitcoins.core.serializers.transaction.RawTransactionOutputParser import org.bitcoins.core.protocol.script._ import org.bitcoins.core.protocol.transaction._ import org.bitcoins.core.script.constant.ScriptToken diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala b/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala index aaf97baae0..29bef462ba 100644 --- a/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala +++ b/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala @@ -1,14 +1,14 @@ package org.bitcoins.core.protocol.script import org.bitcoins.core.crypto.{ECFactory, ECPublicKey} -import org.bitcoins.core.marshallers.script.{ScriptParser, RawScriptPubKeyParser} -import org.bitcoins.core.marshallers.transaction.TransactionElement +import org.bitcoins.core.serializers.script.{RawScriptPubKeyParser, ScriptParser} import org.bitcoins.core.protocol._ +import org.bitcoins.core.protocol.transaction.TransactionElement import org.bitcoins.core.script.bitwise.{OP_EQUAL, OP_EQUALVERIFY} import org.bitcoins.core.script.constant._ -import org.bitcoins.core.script.crypto.{OP_CHECKMULTISIGVERIFY, OP_CHECKMULTISIG, OP_CHECKSIG, OP_HASH160} +import org.bitcoins.core.script.crypto.{OP_CHECKMULTISIG, OP_CHECKMULTISIGVERIFY, OP_CHECKSIG, OP_HASH160} import org.bitcoins.core.script.stack.OP_DUP -import org.bitcoins.core.util.{Factory, BitcoinScriptUtil, BitcoinSLogger} +import org.bitcoins.core.util.{BitcoinSLogger, BitcoinScriptUtil, Factory} /** * Created by chris on 12/26/15. diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala b/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala index 433e9c0b4a..8298ffbfa2 100644 --- a/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala +++ b/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala @@ -1,6 +1,6 @@ package org.bitcoins.core.protocol.script -import org.bitcoins.core.marshallers.script.{RawScriptPubKeyParser, ScriptParser} +import org.bitcoins.core.serializers.script.{RawScriptPubKeyParser, ScriptParser} import org.bitcoins.core.script.bitwise.{OP_EQUAL, OP_EQUALVERIFY} import org.bitcoins.core.script.constant._ import org.bitcoins.core.script.crypto.{OP_CHECKMULTISIGVERIFY, OP_CHECKMULTISIG, OP_CHECKSIG, OP_HASH160} diff --git a/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala b/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala index 400371d2d2..ca877a4ecb 100644 --- a/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala +++ b/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala @@ -1,12 +1,11 @@ package org.bitcoins.core.protocol.script -import org.bitcoins.core.crypto.{EmptyDigitalSignature, ECPublicKey, ECFactory, ECDigitalSignature} -import org.bitcoins.core.marshallers.script.{RawScriptSignatureParser, RawScriptPubKeyParser, ScriptParser} -import org.bitcoins.core.marshallers.transaction.TransactionElement - +import org.bitcoins.core.crypto.{ECDigitalSignature, ECFactory, ECPublicKey, EmptyDigitalSignature} +import org.bitcoins.core.protocol.transaction.TransactionElement +import org.bitcoins.core.serializers.script.{RawScriptPubKeyParser, RawScriptSignatureParser, ScriptParser} import org.bitcoins.core.script.constant._ -import org.bitcoins.core.script.crypto.{SIGHASH_ALL, OP_CHECKMULTISIG, HashType, HashTypeFactory} -import org.bitcoins.core.util.{Factory, BitcoinScriptUtil, BitcoinSLogger, BitcoinSUtil} +import org.bitcoins.core.script.crypto.{HashType, HashTypeFactory, OP_CHECKMULTISIG, SIGHASH_ALL} +import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil, BitcoinScriptUtil, Factory} import org.slf4j.LoggerFactory import scala.util.{Failure, Success, Try} diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala index 53122999b9..40fa252815 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala @@ -1,6 +1,6 @@ package org.bitcoins.core.protocol.transaction -import org.bitcoins.core.marshallers.transaction.{RawTransactionParser, TransactionElement} +import org.bitcoins.core.serializers.transaction.RawTransactionParser import org.bitcoins.core.util.{Factory, BitcoinSUtil, CryptoUtil} /** diff --git a/src/main/scala/org/bitcoins/core/marshallers/transaction/TransactionElement.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala similarity index 85% rename from src/main/scala/org/bitcoins/core/marshallers/transaction/TransactionElement.scala rename to src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala index eb491176a0..0eef16200e 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/transaction/TransactionElement.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala @@ -1,6 +1,6 @@ -package org.bitcoins.core.marshallers.transaction +package org.bitcoins.core.protocol.transaction -import org.bitcoins.core.util.{BitcoinSUtil} +import org.bitcoins.core.util.BitcoinSUtil /** * Created by chris on 1/14/16. diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala index 4dfc53d0ee..cc11eb6828 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala @@ -1,6 +1,6 @@ package org.bitcoins.core.protocol.transaction -import org.bitcoins.core.marshallers.transaction.{RawTransactionParser, RawTransactionInputParser} +import org.bitcoins.core.serializers.transaction.{RawTransactionParser, RawTransactionInputParser} import org.bitcoins.core.util.Factory /** diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala index bf7347cdcc..166d3a9a41 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala @@ -1,6 +1,6 @@ package org.bitcoins.core.protocol.transaction -import org.bitcoins.core.marshallers.transaction.{RawTransactionInputParser, TransactionElement} +import org.bitcoins.core.serializers.transaction.RawTransactionInputParser import org.bitcoins.core.protocol.CompactSizeUInt import org.bitcoins.core.protocol.script.{ScriptPubKey, ScriptSignature} import org.bitcoins.core.script.constant.ScriptToken diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala index c4bad79838..a5d626b4d1 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala @@ -1,6 +1,6 @@ package org.bitcoins.core.protocol.transaction -import org.bitcoins.core.marshallers.transaction.{RawTransactionOutPointParser, TransactionElement} +import org.bitcoins.core.serializers.transaction.RawTransactionOutPointParser import org.bitcoins.core.util.Factory /** diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala index 508db8102e..2f84959ce8 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala @@ -1,7 +1,7 @@ package org.bitcoins.core.protocol.transaction import org.bitcoins.core.currency.{CurrencyUnits, CurrencyUnit, Satoshis} -import org.bitcoins.core.marshallers.transaction.{RawTransactionOutputParser, TransactionElement} +import org.bitcoins.core.serializers.transaction.RawTransactionOutputParser import org.bitcoins.core.protocol.CompactSizeUInt import org.bitcoins.core.protocol.script.{ScriptPubKey} diff --git a/src/main/scala/org/bitcoins/core/marshallers/RawBitcoinSerializer.scala b/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala similarity index 95% rename from src/main/scala/org/bitcoins/core/marshallers/RawBitcoinSerializer.scala rename to src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala index b44f53c9e3..79f2ffa5b0 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/RawBitcoinSerializer.scala +++ b/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala @@ -1,4 +1,4 @@ -package org.bitcoins.core.marshallers +package org.bitcoins.core.serializers import org.bitcoins.core.util.BitcoinSUtil diff --git a/src/main/scala/org/bitcoins/core/marshallers/RawBitcoinSerializerHelper.scala b/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala similarity index 96% rename from src/main/scala/org/bitcoins/core/marshallers/RawBitcoinSerializerHelper.scala rename to src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala index e7853eb42e..6b55ad1d34 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/RawBitcoinSerializerHelper.scala +++ b/src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala @@ -1,4 +1,4 @@ -package org.bitcoins.core.marshallers +package org.bitcoins.core.serializers /** * Created by chris on 2/18/16. diff --git a/src/main/scala/org/bitcoins/core/marshallers/script/RawScriptPubKeyParser.scala b/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala similarity index 86% rename from src/main/scala/org/bitcoins/core/marshallers/script/RawScriptPubKeyParser.scala rename to src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala index 5430a1085e..62bf8ab007 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/script/RawScriptPubKeyParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala @@ -1,6 +1,6 @@ -package org.bitcoins.core.marshallers.script +package org.bitcoins.core.serializers.script -import org.bitcoins.core.marshallers.RawBitcoinSerializer +import org.bitcoins.core.serializers.RawBitcoinSerializer import org.bitcoins.core.protocol.script.{ScriptPubKey} import org.bitcoins.core.script.constant.ScriptToken import org.bitcoins.core.util.BitcoinSLogger diff --git a/src/main/scala/org/bitcoins/core/marshallers/script/RawScriptSignatureParser.scala b/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala similarity index 88% rename from src/main/scala/org/bitcoins/core/marshallers/script/RawScriptSignatureParser.scala rename to src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala index 0cbca846c6..c419c0d2f6 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/script/RawScriptSignatureParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala @@ -1,6 +1,6 @@ -package org.bitcoins.core.marshallers.script +package org.bitcoins.core.serializers.script -import org.bitcoins.core.marshallers.RawBitcoinSerializer +import org.bitcoins.core.serializers.RawBitcoinSerializer import org.bitcoins.core.protocol.script._ import org.bitcoins.core.script.constant.{ScriptConstant, ScriptToken} import org.bitcoins.core.script.crypto.{OP_CHECKMULTISIGVERIFY, OP_CHECKMULTISIG} diff --git a/src/main/scala/org/bitcoins/core/marshallers/script/ScriptParser.scala b/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala similarity index 99% rename from src/main/scala/org/bitcoins/core/marshallers/script/ScriptParser.scala rename to src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala index ef3a347fbe..26fed2eb4a 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/script/ScriptParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala @@ -1,4 +1,4 @@ -package org.bitcoins.core.marshallers.script +package org.bitcoins.core.serializers.script import org.bitcoins.core.script._ import org.bitcoins.core.script.constant._ diff --git a/src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionInputParser.scala b/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala similarity index 96% rename from src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionInputParser.scala rename to src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala index e6ba6226d8..2a0e1ffdfa 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionInputParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala @@ -1,7 +1,7 @@ -package org.bitcoins.core.marshallers.transaction +package org.bitcoins.core.serializers.transaction -import org.bitcoins.core.marshallers.RawBitcoinSerializer -import org.bitcoins.core.marshallers.script.RawScriptSignatureParser +import org.bitcoins.core.serializers.RawBitcoinSerializer +import org.bitcoins.core.serializers.script.RawScriptSignatureParser import org.bitcoins.core.protocol.{CompactSizeUInt} import org.bitcoins.core.protocol.script.ScriptSignature import org.bitcoins.core.protocol.transaction.{TransactionOutPoint, TransactionInput} diff --git a/src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutPointParser.scala b/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala similarity index 90% rename from src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutPointParser.scala rename to src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala index 62b79a076f..416f9523e1 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutPointParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala @@ -1,6 +1,6 @@ -package org.bitcoins.core.marshallers.transaction +package org.bitcoins.core.serializers.transaction -import org.bitcoins.core.marshallers.RawBitcoinSerializer +import org.bitcoins.core.serializers.RawBitcoinSerializer import org.bitcoins.core.protocol.transaction.{ TransactionOutPoint} import org.bitcoins.core.util.BitcoinSUtil diff --git a/src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutputParser.scala b/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala similarity index 95% rename from src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutputParser.scala rename to src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala index 43b1179edb..2cf115551c 100644 --- a/src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutputParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala @@ -1,8 +1,8 @@ -package org.bitcoins.core.marshallers.transaction +package org.bitcoins.core.serializers.transaction import org.bitcoins.core.currency.{CurrencyUnits, Satoshis} -import org.bitcoins.core.marshallers.RawBitcoinSerializer -import org.bitcoins.core.marshallers.script.{RawScriptPubKeyParser, ScriptParser} +import org.bitcoins.core.serializers.RawBitcoinSerializer +import org.bitcoins.core.serializers.script.{RawScriptPubKeyParser, ScriptParser} import org.bitcoins.core.protocol.CompactSizeUInt import org.bitcoins.core.protocol.transaction.{TransactionOutputImpl, TransactionOutput} import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil} diff --git a/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala b/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala index beff243afa..64f443d218 100644 --- a/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala +++ b/src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala @@ -6,7 +6,7 @@ import org.bitcoinj.core.{DumpedPrivateKey, Sha256Hash, Utils} import org.bitcoinj.core.Transaction.SigHash import org.bitcoinj.params.TestNet3Params import org.bitcoinj.script.{ScriptBuilder, ScriptChunk, ScriptOpCodes} -import org.bitcoins.core.marshallers.script.ScriptParser +import org.bitcoins.core.serializers.script.ScriptParser import org.bitcoins.core.protocol.script._ import org.bitcoins.core.protocol.transaction._ import org.bitcoins.core.script.ScriptOperationFactory diff --git a/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala b/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala index 622125d3a2..695a2c8189 100644 --- a/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala +++ b/src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala @@ -2,7 +2,7 @@ package org.bitcoins.core.protocol.script import org.bitcoins.core.crypto.ECFactory -import org.bitcoins.core.marshallers.script.RawScriptSignatureParser +import org.bitcoins.core.serializers.script.RawScriptSignatureParser import org.bitcoins.core.script.constant._ import org.bitcoins.core.script.crypto.{SIGHASH_SINGLE, SIGHASH_ALL} import org.bitcoins.core.util.{BitcoinScriptUtil, TransactionTestUtil, TestUtil} diff --git a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala b/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala index 6ad86ce359..f9f4edfde5 100644 --- a/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala +++ b/src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala @@ -1,6 +1,6 @@ package org.bitcoins.core.protocol.transaction -import org.bitcoins.core.marshallers.transaction.RawTransactionParser +import org.bitcoins.core.serializers.transaction.RawTransactionParser import org.bitcoins.core.protocol.script.ScriptPubKey import org.bitcoins.core.protocol.transaction.testprotocol.CoreTransactionTestCase import org.bitcoins.core.script.ScriptProgram diff --git a/src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala b/src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala index 222a213b93..363268f3bc 100644 --- a/src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala +++ b/src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala @@ -1,6 +1,6 @@ package org.bitcoins.core.script.control -import org.bitcoins.core.marshallers.script.ScriptParser +import org.bitcoins.core.serializers.script.ScriptParser import org.bitcoins.core.script.ScriptProgram import org.bitcoins.core.script.arithmetic.OP_ADD import org.bitcoins.core.script.bitwise.OP_EQUAL diff --git a/src/test/scala/org/bitcoins/core/marshallers/script/RawScriptPubKeyParserTest.scala b/src/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala similarity index 98% rename from src/test/scala/org/bitcoins/core/marshallers/script/RawScriptPubKeyParserTest.scala rename to src/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala index 2f4adce856..7615bf1856 100644 --- a/src/test/scala/org/bitcoins/core/marshallers/script/RawScriptPubKeyParserTest.scala +++ b/src/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala @@ -1,5 +1,5 @@ -package org.bitcoins.core.marshallers.script +package org.bitcoins.core.serializers.script import org.bitcoins.core.protocol.script.ScriptPubKey import org.bitcoins.core.script.bitwise.OP_EQUALVERIFY diff --git a/src/test/scala/org/bitcoins/core/marshallers/script/RawScriptSignatureParserTest.scala b/src/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala similarity index 99% rename from src/test/scala/org/bitcoins/core/marshallers/script/RawScriptSignatureParserTest.scala rename to src/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala index e5baf54010..912c5364cf 100644 --- a/src/test/scala/org/bitcoins/core/marshallers/script/RawScriptSignatureParserTest.scala +++ b/src/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala @@ -1,4 +1,4 @@ -package org.bitcoins.core.marshallers.script +package org.bitcoins.core.serializers.script import org.bitcoins.core.protocol.script.ScriptSignature import org.bitcoins.core.script.constant._ diff --git a/src/test/scala/org/bitcoins/core/marshallers/script/ScriptParserTest.scala b/src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala similarity index 99% rename from src/test/scala/org/bitcoins/core/marshallers/script/ScriptParserTest.scala rename to src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala index 705a6651a8..78d4889645 100644 --- a/src/test/scala/org/bitcoins/core/marshallers/script/ScriptParserTest.scala +++ b/src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala @@ -1,4 +1,4 @@ -package org.bitcoins.core.marshallers.script +package org.bitcoins.core.serializers.script import org.bitcoins.core.protocol.script.ScriptSignature import org.bitcoins.core.script.arithmetic.{OP_1ADD, OP_ADD} diff --git a/src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionInputParserTest.scala b/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala similarity index 99% rename from src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionInputParserTest.scala rename to src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala index 60e663b370..2b90e42c60 100644 --- a/src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionInputParserTest.scala +++ b/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala @@ -1,4 +1,4 @@ -package org.bitcoins.core.marshallers.transaction +package org.bitcoins.core.serializers.transaction import org.bitcoins.core.protocol.transaction.{TransactionConstants, TransactionInput} diff --git a/src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutPointParserTest.scala b/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala similarity index 97% rename from src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutPointParserTest.scala rename to src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala index 8cf3abefb7..78f48a5212 100644 --- a/src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutPointParserTest.scala +++ b/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala @@ -1,4 +1,4 @@ -package org.bitcoins.core.marshallers.transaction +package org.bitcoins.core.serializers.transaction import org.scalatest.{FlatSpec, MustMatchers} diff --git a/src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutputParserTest.scala b/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala similarity index 98% rename from src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutputParserTest.scala rename to src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala index f5ac1f6e3e..5928403c0d 100644 --- a/src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutputParserTest.scala +++ b/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala @@ -1,5 +1,5 @@ -package org.bitcoins.core.marshallers.transaction +package org.bitcoins.core.serializers.transaction import org.bitcoins.core.currency.{Bitcoins, CurrencyUnits, Satoshis} diff --git a/src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionParserTest.scala b/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionParserTest.scala similarity index 99% rename from src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionParserTest.scala rename to src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionParserTest.scala index 1915eb3cc9..c59ef1479a 100644 --- a/src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionParserTest.scala +++ b/src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionParserTest.scala @@ -1,4 +1,4 @@ -package org.bitcoins.core.marshallers.transaction +package org.bitcoins.core.serializers.transaction import org.bitcoins.core.protocol.transaction.{TransactionConstants, Transaction} import org.bitcoins.core.util.TestUtil diff --git a/src/test/scala/org/bitcoins/core/util/TestUtil.scala b/src/test/scala/org/bitcoins/core/util/TestUtil.scala index 3b2f4635dd..08834b43af 100644 --- a/src/test/scala/org/bitcoins/core/util/TestUtil.scala +++ b/src/test/scala/org/bitcoins/core/util/TestUtil.scala @@ -1,7 +1,7 @@ package org.bitcoins.core.util -import org.bitcoins.core.marshallers.script.{RawScriptSignatureParser, RawScriptPubKeyParser} -import org.bitcoins.core.marshallers.transaction.{RawTransactionInputParser, RawTransactionParser} +import org.bitcoins.core.serializers.script.{RawScriptSignatureParser, RawScriptPubKeyParser} +import org.bitcoins.core.serializers.transaction.{RawTransactionInputParser, RawTransactionParser} import org.bitcoins.core.policy.Policy import org.bitcoins.core.protocol.script._ import org.bitcoins.core.protocol.transaction.{EmptyTransaction, Transaction} From 43029bf9fe608ff6fce3c1ce2891e3c05be4b9a5 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Thu, 19 May 2016 13:22:38 -0500 Subject: [PATCH 2/2] Removing objects/functions that are being refactored into the rpc-client package --- .../core/protocol/transaction/TransactionElement.scala | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala index 0eef16200e..e99b82aec2 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala @@ -11,21 +11,18 @@ trait TransactionElement { /** * The size of the TransactionElement in bytes. - * * @return */ def size : Int = bytes.size /** * The hexadecimal representation of the transaction element - * * @return */ def hex : String /** * The byte representation of the transaction element - * * @return */ def bytes : Seq[Byte] = BitcoinSUtil.decodeHex(hex)