mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-25 07:17:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6 from Christewart/rename_marshallers_to_serializers

Browse source 
Rename marshallers to serializers
This commit is contained in:
Thomas McCabe 2016-05-19 14:36:43 -05:00
commit 940ec1f4ad
30 changed files with 47 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/org/bitcoins/core/crypto/TransactionSignatureSerializer.scala
View file

@ -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

8
src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala
View file

@ -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.

2
src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKeyFactory.scala
View file

@ -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}

11
src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala
View file

@ -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}

2
src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala
View file

@ -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}
/**

7
src/main/scala/org/bitcoins/core/marshallers/transaction/TransactionElement.scala → src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala
View file

@ -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.
@ -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)

2
src/main/scala/org/bitcoins/core/protocol/transaction/TransactionFactory.scala
View file

@ -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
/**

2
src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala
View file

@ -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

2
src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala
View file

@ -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
/**

2
src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala
View file

@ -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}

2
src/main/scala/org/bitcoins/core/marshallers/RawBitcoinSerializer.scala → src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializer.scala
View file

@ -1,4 +1,4 @@
package org.bitcoins.core.marshallers
package org.bitcoins.core.serializers
import org.bitcoins.core.util.BitcoinSUtil

2
src/main/scala/org/bitcoins/core/marshallers/RawBitcoinSerializerHelper.scala → src/main/scala/org/bitcoins/core/serializers/RawBitcoinSerializerHelper.scala
View file

@ -1,4 +1,4 @@
package org.bitcoins.core.marshallers
package org.bitcoins.core.serializers
/**
* Created by chris on 2/18/16.

4
src/main/scala/org/bitcoins/core/marshallers/script/RawScriptPubKeyParser.scala → src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala
View file

@ -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

4
src/main/scala/org/bitcoins/core/marshallers/script/RawScriptSignatureParser.scala → src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala
View file

@ -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}

2
src/main/scala/org/bitcoins/core/marshallers/script/ScriptParser.scala → src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala
View file

@ -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._

6
src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionInputParser.scala → src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParser.scala
View file

@ -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}

4
src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutPointParser.scala → src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParser.scala
View file

@ -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

6
src/main/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutputParser.scala → src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala
View file

@ -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}

2
src/test/scala/org/bitcoins/core/crypto/TransactionSignatureSerializerTest.scala
View file

@ -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

2
src/test/scala/org/bitcoins/core/protocol/script/ScriptSignatureTest.scala
View file

@ -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}

2
src/test/scala/org/bitcoins/core/protocol/transaction/TransactionTest.scala
View file

@ -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

2
src/test/scala/org/bitcoins/core/script/control/ControlOperationsInterpreterTest.scala
View file

@ -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

2
src/test/scala/org/bitcoins/core/marshallers/script/RawScriptPubKeyParserTest.scala → src/test/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParserTest.scala
View file

@ -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

2
src/test/scala/org/bitcoins/core/marshallers/script/RawScriptSignatureParserTest.scala → src/test/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParserTest.scala
View file

@ -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._

2
src/test/scala/org/bitcoins/core/marshallers/script/ScriptParserTest.scala → src/test/scala/org/bitcoins/core/serializers/script/ScriptParserTest.scala
View file

@ -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}

2
src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionInputParserTest.scala → src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionInputParserTest.scala
View file

@ -1,4 +1,4 @@
package org.bitcoins.core.marshallers.transaction
package org.bitcoins.core.serializers.transaction
import org.bitcoins.core.protocol.transaction.{TransactionConstants, TransactionInput}

2
src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutPointParserTest.scala → src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutPointParserTest.scala
View file

@ -1,4 +1,4 @@
package org.bitcoins.core.marshallers.transaction
package org.bitcoins.core.serializers.transaction
import org.scalatest.{FlatSpec, MustMatchers}

2
src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionOutputParserTest.scala → src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParserTest.scala
View file

@ -1,5 +1,5 @@
package org.bitcoins.core.marshallers.transaction
package org.bitcoins.core.serializers.transaction
import org.bitcoins.core.currency.{Bitcoins, CurrencyUnits, Satoshis}

2
src/test/scala/org/bitcoins/core/marshallers/transaction/RawTransactionParserTest.scala → src/test/scala/org/bitcoins/core/serializers/transaction/RawTransactionParserTest.scala
View file

@ -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

4
src/test/scala/org/bitcoins/core/util/TestUtil.scala
View file

@ -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}