diff --git a/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala b/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala index d8d38452a7..93e5f1a2e7 100644 --- a/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala +++ b/src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala @@ -1,17 +1,10 @@ package org.bitcoins.core.crypto -import org.bitcoins.core.config.TestNet3 -import org.bitcoins.core.number.Int32 -import org.bitcoins.core.protocol.CompactSizeUInt -import org.bitcoins.core.protocol.script._ -import org.bitcoins.core.protocol.transaction.{Transaction, TransactionInput} -import org.bitcoins.core.script.ScriptProgram -import org.bitcoins.core.script.constant.{ScriptConstant, ScriptToken} +import org.bitcoins.core.script.constant.ScriptToken import org.bitcoins.core.script.crypto._ -import org.bitcoins.core.script.flag.{ScriptFlag, ScriptFlagUtil, ScriptVerifyDerSig} +import org.bitcoins.core.script.flag.{ScriptFlag, ScriptFlagUtil} import org.bitcoins.core.script.result.ScriptErrorWitnessPubKeyType import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil, BitcoinScriptUtil} -import org.slf4j.LoggerFactory import scala.annotation.tailrec diff --git a/src/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala b/src/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala index f6bfdf00fd..5f7747b99f 100644 --- a/src/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala +++ b/src/main/scala/org/bitcoins/core/script/ScriptOperationFactory.scala @@ -9,8 +9,7 @@ import org.bitcoins.core.script.locktime.LocktimeOperation import org.bitcoins.core.script.reserved.ReservedOperation import org.bitcoins.core.script.splice.SpliceOperation import org.bitcoins.core.script.stack.StackOperation -import org.bitcoins.core.util.{BitcoinSUtil, BitcoinSLogger} -import org.slf4j.LoggerFactory +import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil} /** * Created by chris on 1/8/16. diff --git a/src/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala b/src/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala index 7f66e29812..ffb908d012 100644 --- a/src/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala +++ b/src/main/scala/org/bitcoins/core/script/control/ControlOperationsInterpreter.scala @@ -1,12 +1,11 @@ package org.bitcoins.core.script.control import org.bitcoins.core.protocol.script.SigVersionWitnessV0 -import org.bitcoins.core.script.result._ import org.bitcoins.core.script.ScriptProgram import org.bitcoins.core.script.constant._ import org.bitcoins.core.script.flag.ScriptFlagUtil +import org.bitcoins.core.script.result._ import org.bitcoins.core.util._ -import org.slf4j.LoggerFactory import scala.annotation.tailrec diff --git a/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala b/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala index 4899899f03..97f646aa3a 100644 --- a/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/script/RawScriptPubKeyParser.scala @@ -1,11 +1,9 @@ package org.bitcoins.core.serializers.script import org.bitcoins.core.protocol.CompactSizeUInt -import org.bitcoins.core.serializers.RawBitcoinSerializer import org.bitcoins.core.protocol.script.{EmptyScriptPubKey, ScriptPubKey} import org.bitcoins.core.script.constant.ScriptToken -import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil} -import org.slf4j.LoggerFactory +import org.bitcoins.core.serializers.RawBitcoinSerializer import scala.util.Try diff --git a/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala b/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala index 5bbe5c6bfd..306f03d791 100644 --- a/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/script/RawScriptSignatureParser.scala @@ -1,12 +1,10 @@ package org.bitcoins.core.serializers.script import org.bitcoins.core.protocol.CompactSizeUInt -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_CHECKMULTISIG, OP_CHECKMULTISIGVERIFY} -import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil} -import org.slf4j.LoggerFactory +import org.bitcoins.core.script.constant.ScriptToken +import org.bitcoins.core.serializers.RawBitcoinSerializer +import org.bitcoins.core.util.BitcoinSLogger import scala.util.Try diff --git a/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala b/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala index 9c77ac0d2b..ac41e95d3f 100644 --- a/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/script/ScriptParser.scala @@ -3,12 +3,10 @@ package org.bitcoins.core.serializers.script import org.bitcoins.core.number.UInt32 import org.bitcoins.core.script._ import org.bitcoins.core.script.constant._ -import org.bitcoins.core.script.crypto.{OP_CHECKMULTISIG, OP_CHECKMULTISIGVERIFY} -import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil, Factory, NumberUtil} -import org.slf4j.LoggerFactory +import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil, Factory} import scala.annotation.tailrec -import scala.util.{Failure, Success, Try} +import scala.util.Try /** * Created by chris on 1/7/16. diff --git a/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala b/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala index eed411204a..7f394509fc 100644 --- a/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala +++ b/src/main/scala/org/bitcoins/core/serializers/transaction/RawTransactionOutputParser.scala @@ -2,12 +2,11 @@ package org.bitcoins.core.serializers.transaction import org.bitcoins.core.currency.{CurrencyUnits, Satoshis} import org.bitcoins.core.number.UInt64 -import org.bitcoins.core.serializers.{RawBitcoinSerializer, RawSatoshisSerializer} -import org.bitcoins.core.serializers.script.{RawScriptPubKeyParser, ScriptParser} import org.bitcoins.core.protocol.CompactSizeUInt -import org.bitcoins.core.protocol.transaction.{TransactionOutput, TransactionOutputImpl} +import org.bitcoins.core.protocol.transaction.TransactionOutput +import org.bitcoins.core.serializers.script.{RawScriptPubKeyParser, ScriptParser} +import org.bitcoins.core.serializers.{RawBitcoinSerializer, RawSatoshisSerializer} import org.bitcoins.core.util.{BitcoinSLogger, BitcoinSUtil} -import org.slf4j.LoggerFactory import scala.annotation.tailrec