From a0bfde8db02a7f98b15d28ed18d919f421513fbf Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Thu, 10 Apr 2014 20:33:11 -0500 Subject: [PATCH] Update btcctl for latest btcjson changes. --- util/btcctl/btcctl.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go index eaf58b57c..aaad86e17 100644 --- a/util/btcctl/btcctl.go +++ b/util/btcctl/btcctl.go @@ -229,20 +229,14 @@ func makeCreateEncryptedWallet(args []interface{}) (btcjson.Cmd, error) { // makeCreateRawTransaction generates the cmd structure for createrawtransaction // commands. func makeCreateRawTransaction(args []interface{}) (btcjson.Cmd, error) { - // First unmarshal the JSON provided by the parameters into interfaces. - var iinputs, iamounts interface{} - err := json.Unmarshal([]byte(args[0].(string)), &iinputs) - if err != nil { - return nil, err - } - err = json.Unmarshal([]byte(args[1].(string)), &iamounts) + var inputs []btcjson.TransactionInput + err := json.Unmarshal([]byte(args[0].(string)), &inputs) if err != nil { return nil, err } - // Validate and convert the interfaces to concrete types. - inputs, amounts, err := btcjson.ConvertCreateRawTxParams(iinputs, - iamounts) + var amounts map[string]int64 + err = json.Unmarshal([]byte(args[1].(string)), &amounts) if err != nil { return nil, err }