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

Added tests for abortRescan, getAccount, getAccountAddress, getChainTxStats, getReceivedByAccount, listAccounts, listReceivedByAccount, listWallets, logging, move, rescanBlockChain, saveMemPool, setAccount, and uptime

Browse source
This commit is contained in:
nkohen 2018-06-18 17:47:05 -05:00
parent b4c3e2ac57
commit 79a3917adc
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpc/src/main/scala/org/bitcoins/rpc/jsonmodels/WalletResult.scala
View file

@ -72,6 +72,6 @@ case class ImportMultiError(code: Int, message: String) extends WalletResult
case class DumpWalletResult(filename: File)
case class RescanBlockChainResult(
start_height: Option[Int],
stop_height: Option[Int]
start_height: Int,
stop_height: Int
) extends WalletResult

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

@ -58,6 +58,7 @@ object JsonSerializers {
implicit val transactionInputWrites: Writes[TransactionInput] =
TransactionInputWrites
implicit val uInt32Writes: Writes[UInt32] = UInt32Writes
implicit val transactionWrites: Writes[Transaction] = TransactionWrites
// Network Models
implicit val networkReads: Reads[Network] = Json.reads[Network]

6
rpc/src/main/scala/org/bitcoins/rpc/serializers/JsonWriters.scala
View file

@ -5,7 +5,7 @@ import org.bitcoins.core.currency.Bitcoins
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.TransactionInput
import org.bitcoins.core.protocol.transaction.{Transaction, TransactionInput}
import play.api.libs.json._
object JsonWriters {
@ -37,6 +37,10 @@ object JsonWriters {
override def writes(o: UInt32): JsValue = JsNumber(o.toLong)
}
implicit object TransactionWrites extends Writes[Transaction] {
override def writes(o: Transaction): JsValue = JsString(o.hex)
}
implicit def mapWrites[K,V](keyString: K => String)(implicit vWrites: Writes[V]): Writes[Map[K,V]] = new Writes[Map[K,V]] {
override def writes(o: Map[K, V]): JsValue = {
Json.toJson(o.map{case (k, v) => (keyString(k), v)})