mirror of
https://github.com/bitcoin-s/bitcoin-s.git
synced 2025-02-24 06:57:51 +01:00
Cleanup: Moved all case classes out of RpcClient and made implicit ActorMaterializer and ExecutionContext be given when instantiating the client instead of with every call.
This commit is contained in:
parent
9db6436573
commit
11b469e36f
3 changed files with 59 additions and 2 deletions
|
@ -93,3 +93,40 @@ case class NodeAddress(
|
||||||
address: InetAddress,
|
address: InetAddress,
|
||||||
connected: String
|
connected: String
|
||||||
) extends NetworkResult
|
) extends NetworkResult
|
||||||
|
|
||||||
|
// Is Double the correct type for priorities? PRIORITY
|
||||||
|
case class GetMemPoolEntryResult(
|
||||||
|
size: Int,
|
||||||
|
fee: Bitcoins,
|
||||||
|
modifiedfee: Bitcoins,
|
||||||
|
time: UInt32,
|
||||||
|
height: Int,
|
||||||
|
startingpriority: Double,
|
||||||
|
currentpriority: Double,
|
||||||
|
descendantcount: Int,
|
||||||
|
descendantsize: Int,
|
||||||
|
descendantfees: Int,
|
||||||
|
ancestorcount: Int,
|
||||||
|
ancestorsize: Int,
|
||||||
|
ancestorfees: Int,
|
||||||
|
depends: Option[Array[DoubleSha256Digest]]
|
||||||
|
) extends NetworkResult
|
||||||
|
|
||||||
|
case class GetMemPoolInfoResult(
|
||||||
|
size: Int,
|
||||||
|
bytes: Int,
|
||||||
|
usage: Int,
|
||||||
|
maxmempool: Int,
|
||||||
|
mempoolminfee: Bitcoins,
|
||||||
|
minrelaytxfee: Bitcoins
|
||||||
|
) extends NetworkResult
|
||||||
|
|
||||||
|
case class GetTxOutSetInfoResult(
|
||||||
|
height: Int,
|
||||||
|
bestblock: DoubleSha256Digest,
|
||||||
|
transactions: Int,
|
||||||
|
txouts: Int,
|
||||||
|
bytes_serialized: Int,
|
||||||
|
hash_serialized: DoubleSha256Digest,
|
||||||
|
total_amount: Bitcoins
|
||||||
|
) extends NetworkResult
|
|
@ -3,6 +3,8 @@ package org.bitcoins.rpc.jsonmodels
|
||||||
import org.bitcoins.core.crypto.DoubleSha256Digest
|
import org.bitcoins.core.crypto.DoubleSha256Digest
|
||||||
import org.bitcoins.core.currency.Bitcoins
|
import org.bitcoins.core.currency.Bitcoins
|
||||||
import org.bitcoins.core.number.UInt32
|
import org.bitcoins.core.number.UInt32
|
||||||
|
import org.bitcoins.core.protocol.Address
|
||||||
|
import org.bitcoins.core.protocol.script.ScriptPubKey
|
||||||
|
|
||||||
sealed abstract class WalletResult
|
sealed abstract class WalletResult
|
||||||
|
|
||||||
|
@ -20,3 +22,11 @@ case class GetWalletInfoResult(
|
||||||
hdmasterkeyid: DoubleSha256Digest, // Is this right?
|
hdmasterkeyid: DoubleSha256Digest, // Is this right?
|
||||||
unlocked_until: Option[Int]
|
unlocked_until: Option[Int]
|
||||||
) extends WalletResult
|
) extends WalletResult
|
||||||
|
case class BumpFeeResult(
|
||||||
|
txid: DoubleSha256Digest,
|
||||||
|
origfee: Bitcoins,
|
||||||
|
fee: Bitcoins,
|
||||||
|
warnings: String
|
||||||
|
) extends WalletResult
|
||||||
|
|
||||||
|
case class CreateMultiSigResult(address: Address, redeemScript: ScriptPubKey) extends WalletResult
|
|
@ -40,9 +40,19 @@ object JsonSerializers {
|
||||||
implicit val nodeAddressReads: Reads[NodeAddress] = Json.reads[NodeAddress]
|
implicit val nodeAddressReads: Reads[NodeAddress] = Json.reads[NodeAddress]
|
||||||
implicit val nodeReads: Reads[Node] = Json.reads[Node]
|
implicit val nodeReads: Reads[Node] = Json.reads[Node]
|
||||||
|
|
||||||
|
implicit val getMemPoolEntryResultReads: Reads[GetMemPoolEntryResult] = Json.reads[GetMemPoolEntryResult]
|
||||||
|
|
||||||
|
implicit val getMemPoolInfoResultReads: Reads[GetMemPoolInfoResult] = Json.reads[GetMemPoolInfoResult]
|
||||||
|
|
||||||
|
implicit val getTxOutSetInfoResultReads: Reads[GetTxOutSetInfoResult] = Json.reads[GetTxOutSetInfoResult]
|
||||||
|
|
||||||
// Mining Models
|
// Mining Models
|
||||||
implicit val miningInfoReads: Reads[GetMiningInfoResult] = Json.reads[GetMiningInfoResult]
|
implicit val miningInfoReads: Reads[GetMiningInfoResult] = Json.reads[GetMiningInfoResult]
|
||||||
|
|
||||||
// Wallet Models
|
// Wallet Models
|
||||||
implicit val getWalletInfoResultReads: Reads[GetWalletInfoResult] = Json.reads[GetWalletInfoResult]
|
implicit val getWalletInfoResultReads: Reads[GetWalletInfoResult] = Json.reads[GetWalletInfoResult]
|
||||||
|
|
||||||
|
implicit val bumpFeeReads: Reads[BumpFeeResult] = Json.reads[BumpFeeResult]
|
||||||
|
|
||||||
|
implicit val createMultiSigReads: Reads[CreateMultiSigResult] = Json.reads[CreateMultiSigResult]
|
||||||
}
|
}
|
Loading…
Add table
Reference in a new issue