Update for recent btcjson changes.

This commit updates the types to match the recent changes to the btcjson
result types.
This commit is contained in:
Dave Collins 2014-06-29 17:21:30 -05:00
parent 2a006cc83a
commit 478a7ec867

View file

@ -1263,11 +1263,11 @@ func GetInfo(icmd btcjson.Cmd) (interface{}, error) {
for _, v := range accounts { for _, v := range accounts {
balance += v balance += v
} }
info.WalletVersion = int(wallet.VersCurrent.Uint32()) info.WalletVersion = int32(wallet.VersCurrent.Uint32())
info.Balance = balance info.Balance = balance
// Keypool times are not tracked. set to current time. // Keypool times are not tracked. set to current time.
info.KeypoolOldest = time.Now().Unix() info.KeypoolOldest = time.Now().Unix()
info.KeypoolSize = int(cfg.KeypoolSize) info.KeypoolSize = int32(cfg.KeypoolSize)
TxFeeIncrement.Lock() TxFeeIncrement.Lock()
info.PaytxFee = float64(TxFeeIncrement.i) / float64(btcutil.SatoshiPerBitcoin) info.PaytxFee = float64(TxFeeIncrement.i) / float64(btcutil.SatoshiPerBitcoin)
TxFeeIncrement.Unlock() TxFeeIncrement.Unlock()
@ -2636,7 +2636,7 @@ func ValidateAddress(icmd btcjson.Cmd) (interface{}, error) {
// script type // script type
result.Script = class.String() result.Script = class.String()
if class == btcscript.MultiSigTy { if class == btcscript.MultiSigTy {
result.SigsRequired = sa.RequiredSigs() result.SigsRequired = int32(sa.RequiredSigs())
} }
} }
} }