From 8305cc651c5cd2de857d648a88978717d3d55b52 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Tue, 24 May 2016 09:22:26 -0500 Subject: [PATCH] Renaming TransactionElement to NetworkElement --- ...ransactionElement.scala => NetworkElement.scala} | 13 +++++++------ .../core/protocol/script/ScriptPubKey.scala | 3 +-- .../core/protocol/script/ScriptSignature.scala | 4 ++-- .../core/protocol/transaction/Transaction.scala | 5 +++-- .../protocol/transaction/TransactionInput.scala | 4 ++-- .../protocol/transaction/TransactionOutPoint.scala | 3 ++- .../protocol/transaction/TransactionOutput.scala | 11 +++++------ 7 files changed, 22 insertions(+), 21 deletions(-) rename src/main/scala/org/bitcoins/core/protocol/{transaction/TransactionElement.scala => NetworkElement.scala} (64%) diff --git a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala b/src/main/scala/org/bitcoins/core/protocol/NetworkElement.scala similarity index 64% rename from src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala rename to src/main/scala/org/bitcoins/core/protocol/NetworkElement.scala index e99b82aec2..43c4b986f8 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionElement.scala +++ b/src/main/scala/org/bitcoins/core/protocol/NetworkElement.scala @@ -1,13 +1,14 @@ -package org.bitcoins.core.protocol.transaction +package org.bitcoins.core.protocol import org.bitcoins.core.util.BitcoinSUtil + /** - * Created by chris on 1/14/16. - * Represents an element of a transction. - * Examples would be inputs, outputs, scriptSigs, scriptPubKeys etc. - */ -trait TransactionElement { + * Created by chris on 1/14/16. + * This represents a element that can be serialized to + * be sent over the network + */ +trait NetworkElement { /** * The size of the TransactionElement in bytes. 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 29bef462ba..9c198517a3 100644 --- a/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala +++ b/src/main/scala/org/bitcoins/core/protocol/script/ScriptPubKey.scala @@ -3,7 +3,6 @@ package org.bitcoins.core.protocol.script import org.bitcoins.core.crypto.{ECFactory, ECPublicKey} 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_CHECKMULTISIG, OP_CHECKMULTISIGVERIFY, OP_CHECKSIG, OP_HASH160} @@ -13,7 +12,7 @@ import org.bitcoins.core.util.{BitcoinSLogger, BitcoinScriptUtil, Factory} /** * Created by chris on 12/26/15. */ -sealed trait ScriptPubKey extends TransactionElement with BitcoinSLogger { +sealed trait ScriptPubKey extends NetworkElement with BitcoinSLogger { /** * Representation of a scriptSignature in a parsed assembly format 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 ca877a4ecb..50572a6c9b 100644 --- a/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala +++ b/src/main/scala/org/bitcoins/core/protocol/script/ScriptSignature.scala @@ -1,7 +1,7 @@ package org.bitcoins.core.protocol.script import org.bitcoins.core.crypto.{ECDigitalSignature, ECFactory, ECPublicKey, EmptyDigitalSignature} -import org.bitcoins.core.protocol.transaction.TransactionElement +import org.bitcoins.core.protocol.NetworkElement import org.bitcoins.core.serializers.script.{RawScriptPubKeyParser, RawScriptSignatureParser, ScriptParser} import org.bitcoins.core.script.constant._ import org.bitcoins.core.script.crypto.{HashType, HashTypeFactory, OP_CHECKMULTISIG, SIGHASH_ALL} @@ -14,7 +14,7 @@ import scala.util.{Failure, Success, Try} * Created by chris on 12/26/15. * */ -sealed trait ScriptSignature extends TransactionElement with BitcoinSLogger { +sealed trait ScriptSignature extends NetworkElement with BitcoinSLogger { /** * Representation of a scriptSignature in a parsed assembly format 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 40fa252815..8e485b4609 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala @@ -1,14 +1,15 @@ package org.bitcoins.core.protocol.transaction +import org.bitcoins.core.protocol.NetworkElement import org.bitcoins.core.serializers.transaction.RawTransactionParser -import org.bitcoins.core.util.{Factory, BitcoinSUtil, CryptoUtil} +import org.bitcoins.core.util.{BitcoinSUtil, CryptoUtil, Factory} /** * Created by chris on 7/14/15. */ -sealed trait Transaction extends TransactionElement { +sealed trait Transaction extends NetworkElement { /** * The sha256(sha256(tx)) of this transaction * 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 166d3a9a41..3f7f71e1be 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionInput.scala @@ -1,7 +1,7 @@ package org.bitcoins.core.protocol.transaction import org.bitcoins.core.serializers.transaction.RawTransactionInputParser -import org.bitcoins.core.protocol.CompactSizeUInt +import org.bitcoins.core.protocol.{CompactSizeUInt, NetworkElement} import org.bitcoins.core.protocol.script.{ScriptPubKey, ScriptSignature} import org.bitcoins.core.script.constant.ScriptToken import org.bitcoins.core.util.{BitcoinSUtil, Factory} @@ -10,7 +10,7 @@ import org.bitcoins.core.util.{BitcoinSUtil, Factory} * Created by chris on 12/26/15. * Algebraic data type that represents a transaction input */ -sealed trait TransactionInput extends TransactionElement { +sealed trait TransactionInput extends NetworkElement { def previousOutput : TransactionOutPoint def scriptSignature : ScriptSignature 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 a5d626b4d1..43cd268b2b 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutPoint.scala @@ -1,5 +1,6 @@ package org.bitcoins.core.protocol.transaction +import org.bitcoins.core.protocol.NetworkElement import org.bitcoins.core.serializers.transaction.RawTransactionOutPointParser import org.bitcoins.core.util.Factory @@ -7,7 +8,7 @@ import org.bitcoins.core.util.Factory * Created by chris on 12/26/15. * */ -sealed trait TransactionOutPoint extends TransactionElement { +sealed trait TransactionOutPoint extends NetworkElement { /** * The transaction id for the crediting transaction for this input * 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 2f84959ce8..93c76e245e 100644 --- a/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala +++ b/src/main/scala/org/bitcoins/core/protocol/transaction/TransactionOutput.scala @@ -1,17 +1,16 @@ package org.bitcoins.core.protocol.transaction -import org.bitcoins.core.currency.{CurrencyUnits, CurrencyUnit, Satoshis} +import org.bitcoins.core.currency.{CurrencyUnit, CurrencyUnits, Satoshis} import org.bitcoins.core.serializers.transaction.RawTransactionOutputParser -import org.bitcoins.core.protocol.CompactSizeUInt - -import org.bitcoins.core.protocol.script.{ScriptPubKey} -import org.bitcoins.core.util.{Factory, BitcoinSUtil} +import org.bitcoins.core.protocol.{CompactSizeUInt, NetworkElement} +import org.bitcoins.core.protocol.script.ScriptPubKey +import org.bitcoins.core.util.{BitcoinSUtil, Factory} /** * Created by chris on 12/26/15. */ -sealed trait TransactionOutput extends TransactionElement { +sealed trait TransactionOutput extends NetworkElement { def value : CurrencyUnit def scriptPubKey : ScriptPubKey