mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-23 14:50:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Created separate Payment objects for listTransactions and listSinceBlock to avoid Scala's limit of 22 parameters

Browse source
This commit is contained in:
nkohen 2018-06-04 13:17:41 -05:00
parent e392c5c9b6
commit 1df9efe464
2 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/NetworkResult.scala
View file

@ -188,34 +188,58 @@ case class RpcScriptPubKey(
scriptType: String,
addresses: Vector[BitcoinAddress]) extends NetworkResult
case class ListSinceBlockResult(
transactions: Vector[Payment],
lastblock: DoubleSha256Digest) extends NetworkResult
case class Payment( // TODO: Get around the limit for parameters
case class Payment(
involvesWatchonly: Option[Boolean],
account: String,
address: Option[BitcoinAddress],
category: String,
amount: Bitcoins,
vout: Option[Int],
vout: Int,
fee: Option[Bitcoins],
confirmations: Option[Int],
confirmations: Int,
generated: Option[Boolean],
blockhash: Option[DoubleSha256Digest],
blockindex: Option[Int],
blocktime: Option[UInt32],
txid: Option[DoubleSha256Digest],
walletconflicts: Option[Vector[DoubleSha256Digest]],
txid: DoubleSha256Digest,
walletconflicts: Vector[DoubleSha256Digest],
time: UInt32,
timereceived: Option[UInt32],
timereceived: UInt32,
bip125_replaceable: String,
comment: Option[String],
to: Option[String],
label: Option[String],
trusted: Option[Boolean],
otheraccount: Option[String],
abandoned: Option[Boolean]) extends NetworkResult
lastblock: DoubleSha256Digest) extends NetworkResult
case class ListTransactionsResult(
account: String,
address: Option[BitcoinAddress],
category: String,
amount: Bitcoins,
label: Option[String],
vout: Option[Int],
fee: Option[Bitcoins],
confirmations: Option[Int],
trusted: Option[Boolean],
generated: Option[Boolean],
blockhash: Option[DoubleSha256Digest],
blockindex: Option[Int],
blocktime: Option[UInt32],
txid: Option[DoubleSha256Digest],
walletconflicts: Option[Vector[DoubleSha256Digest]],
time: UInt32,
timereceived: Option[UInt32],
comment: Option[String],
to: Option[String],
otheraccount: Option[String],
bip125_replaceable: String, // TODO: Needs to be a - not a _
abandoned: Option[Boolean]
) extends NetworkResult
case class ReceivedAddress(
involvesWatchonly: Option[Boolean],

2
rpc/src/main/scala/org/bitcoins/rpc/serializers/JsonSerializers.scala
View file

@ -74,6 +74,8 @@ object JsonSerializers {
implicit val paymentReads: Reads[Payment] = Json.reads[Payment]
implicit val listSinceBlockResultReads: Reads[ListSinceBlockResult] = Json.reads[ListSinceBlockResult]
implicit val listTransactionsResultReads: Reads[ListTransactionsResult] = Json.reads[ListTransactionsResult]
implicit val receivedAddressReads: Reads[ReceivedAddress] = Json.reads[ReceivedAddress]
implicit val TransactionDetailsReads: Reads[TransactionDetails] = Json.reads[TransactionDetails]