mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-01-19 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added tests for bumpFee and combineRawTransaction

Browse Source
This commit is contained in:
nkohen 2018-06-21 15:56:38 -05:00
parent e9d6d6410a
commit 0198124259
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/RawTransactionResult.scala
View File

@ -87,6 +87,6 @@ case class SignRawTransactionError(
txid: DoubleSha256Digest,
vout: Int,
scriptSig: ScriptPubKey,
sequence: Int,
sequence: UInt32,
error: String
) extends RawTransactionResult

2
rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/WalletResult.scala
View File

@ -24,7 +24,7 @@ case class BumpFeeResult(
txid: DoubleSha256Digest,
origfee: Bitcoins,
fee: Bitcoins, // Should be BitcoinFeeUnit
warnings: String)
errors: Vector[String])
extends WalletResult
case class GetTransactionResult(

3
rpc/src/main/scala/org/bitcoins/rpc/serializers/JsonWriters.scala
View File

@ -6,6 +6,7 @@ import org.bitcoins.core.number.UInt32
import org.bitcoins.core.protocol.BitcoinAddress
import org.bitcoins.core.protocol.script.ScriptPubKey
import org.bitcoins.core.protocol.transaction.{Transaction, TransactionInput}
import org.bitcoins.core.util.BitcoinSUtil
import play.api.libs.json._
object JsonWriters {
@ -22,7 +23,7 @@ object JsonWriters {
}
implicit object ScriptPubKeyWrites extends Writes[ScriptPubKey] {
override def writes(o: ScriptPubKey): JsValue = JsString(o.hex)
override def writes(o: ScriptPubKey): JsValue = JsString(BitcoinSUtil.encodeHex(o.asmBytes))
}
implicit object TransactionInputWrites extends Writes[TransactionInput] {