mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2024-11-20 02:11:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added tests for createMultiSig, addMultiSig, decodeScript, importPrivKey, signMessage, signMessageWithPrivKey, verifyMessage, importMulti

Browse Source
This commit is contained in:
nkohen 2018-06-13 16:15:40 -05:00
parent e7ad9500da
commit 00c2abcd48
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,7 +426,7 @@ case class PeerNetworkInfo(
bytessent: Int,
bytesrecv: Int,
conntime: UInt32,
timeoffset: UInt32,
timeoffset: Int,
pingtime: Option[BigDecimal],
minping: Option[BigDecimal],
pingwait: Option[BigDecimal]) extends NetworkResult

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

@ -34,7 +34,7 @@ case class BumpFeeResult(
warnings: String)
extends WalletResult
case class CreateMultiSigResult(address: Address, redeemScript: ScriptPubKey)
case class MultiSigResult(address: BitcoinAddress, redeemScript: ScriptPubKey)
extends WalletResult
case class DecodeScriptResult(

4
rpc/src/main/scala/org/bitcoins/rpc/serializers/JsonSerializers.scala
View File

@ -233,8 +233,8 @@ object JsonSerializers {
implicit val bumpFeeReads: Reads[BumpFeeResult] = Json.reads[BumpFeeResult]
implicit val createMultiSigReads: Reads[CreateMultiSigResult] =
Json.reads[CreateMultiSigResult]
implicit val multiSigReads: Reads[MultiSigResult] =
Json.reads[MultiSigResult]
implicit val decodeScriptResultReads: Reads[DecodeScriptResult] =
((__ \ "asm").read[String] and