cb7c24141a
This commit implements a reimagining of the way the btcjson package functions based upon how the project has evolved and lessons learned while using it since it was first written. It therefore contains significant changes to the API. For now, it has been implemented in a v2 subdirectory to prevent breaking existing callers, but the ultimate goal is to update all callers to use the new version and then to replace the old API with the new one. This also removes the need for the btcws completely since those commands have been rolled in. The following is an overview of the changes and some reasoning behind why they were made: - The infrastructure has been completely changed to be reflection based instead of requiring thousands and thousands of lines of manual, and therefore error prone, marshal/unmarshal code - This makes it much easier to add new commands without making marshalling mistakes since it is simply a struct definition and a call to register that new struct (plus a trivial New<foo>Cmd function and tests, of course) - It also makes it much easier to gain a lot of information from simply looking at the struct definition which was previously not possible such as the order of the parameters, which parameters are required versus optional, and what the default values for optional parameters are - Each command now has usage flags associated with them that can be queried which are intended to allow classification of the commands such as for chain server and wallet server and websocket-only - The help infrastructure has been completely redone to provide automatic generation with caller provided description map and result types. This is in contrast to the previous method of providing the help directly which meant it would end up in the binary of anything that imported the package - Many of the structs have been renamed to use the terminology from the JSON-RPC specification: - RawCmd/Message is now only a single struct named Request to reflect the fact it is a JSON-RPC request - Error is now called RPCError to reflect the fact it is specifically an RPC error as opposed to many of the other errors that are possible - All RPC error codes except the standard JSON-RPC 2.0 errors have been converted from full structs to only codes since an audit of the codebase has shown that the messages are overridden the vast majority of the time with specifics (as they should be) and removing them also avoids the temptation to return non-specific, and therefore not as helpful, error messages - There is now an Error which provides a type assertable error with error codes so callers can better ascertain failure reasons programatically - The ID is no longer a part of the command and is instead specified at the time the command is marshalled into a JSON-RPC request. This aligns better with the way JSON-RPC functions since it is the caller who manages the ID that is sent with any given _request_, not the package - All <Foo>Cmd structs now treat non-pointers as required fields and pointers as optional fields - All New<Foo>Cmd functions now accept the exact number of parameters, with pointers to the appropriate type for optional parameters - This is preferrable to the old vararg syntax since it means the code will fail to compile if the optional arguments are changed now which helps prevent errors creep in over time from missed modifications to optional args - All of the connection related code has been completely eliminated since this package is not intended to used a client, rather it is intended to provide the infrastructure needed to marshal/unmarshal Bitcoin-specific JSON-RPC requests and replies from static types - The btcrpcclient package provides a robust client with connection management and higher-level types that in turn uses the primitives provided by this package - Even if the caller does not wish to use btcrpcclient for some reason, they should still be responsible for connection management since they might want to use any number of connection features which the package would not necessarily support - Synced a few of the commands that have added new optional fields that have since been added to Bitcoin Core - Includes all of the commands and notifications that were previously in btcws - Now provides 100% test coverage with parallel tests - The code is completely golint and go vet clean This has the side effect of addressing nearly everything in, and therefore closes #26. Also fixes #18 and closes #19.
208 lines
5.9 KiB
Go
208 lines
5.9 KiB
Go
// Copyright (c) 2014 Conformal Systems LLC.
|
|
// Use of this source code is governed by an ISC
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package btcjson_test
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/btcsuite/btcjson/v2/btcjson"
|
|
)
|
|
|
|
// TestBtcWalletExtCmds tests all of the btcwallet extended commands marshal and
|
|
// unmarshal into valid results include handling of optional fields being
|
|
// omitted in the marshalled command, while optional fields with defaults have
|
|
// the default assigned on unmarshalled commands.
|
|
func TestBtcWalletExtCmds(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
testID := int(1)
|
|
tests := []struct {
|
|
name string
|
|
newCmd func() (interface{}, error)
|
|
staticCmd func() interface{}
|
|
marshalled string
|
|
unmarshalled interface{}
|
|
}{
|
|
{
|
|
name: "createnewaccount",
|
|
newCmd: func() (interface{}, error) {
|
|
return btcjson.NewCmd("createnewaccount", "acct")
|
|
},
|
|
staticCmd: func() interface{} {
|
|
return btcjson.NewCreateNewAccountCmd("acct")
|
|
},
|
|
marshalled: `{"jsonrpc":"1.0","method":"createnewaccount","params":["acct"],"id":1}`,
|
|
unmarshalled: &btcjson.CreateNewAccountCmd{
|
|
Account: "acct",
|
|
},
|
|
},
|
|
{
|
|
name: "dumpwallet",
|
|
newCmd: func() (interface{}, error) {
|
|
return btcjson.NewCmd("dumpwallet", "filename")
|
|
},
|
|
staticCmd: func() interface{} {
|
|
return btcjson.NewDumpWalletCmd("filename")
|
|
},
|
|
marshalled: `{"jsonrpc":"1.0","method":"dumpwallet","params":["filename"],"id":1}`,
|
|
unmarshalled: &btcjson.DumpWalletCmd{
|
|
Filename: "filename",
|
|
},
|
|
},
|
|
{
|
|
name: "importaddress",
|
|
newCmd: func() (interface{}, error) {
|
|
return btcjson.NewCmd("importaddress", "1Address")
|
|
},
|
|
staticCmd: func() interface{} {
|
|
return btcjson.NewImportAddressCmd("1Address", nil)
|
|
},
|
|
marshalled: `{"jsonrpc":"1.0","method":"importaddress","params":["1Address"],"id":1}`,
|
|
unmarshalled: &btcjson.ImportAddressCmd{
|
|
Address: "1Address",
|
|
Rescan: btcjson.Bool(true),
|
|
},
|
|
},
|
|
{
|
|
name: "importaddress optional",
|
|
newCmd: func() (interface{}, error) {
|
|
return btcjson.NewCmd("importaddress", "1Address", false)
|
|
},
|
|
staticCmd: func() interface{} {
|
|
return btcjson.NewImportAddressCmd("1Address", btcjson.Bool(false))
|
|
},
|
|
marshalled: `{"jsonrpc":"1.0","method":"importaddress","params":["1Address",false],"id":1}`,
|
|
unmarshalled: &btcjson.ImportAddressCmd{
|
|
Address: "1Address",
|
|
Rescan: btcjson.Bool(false),
|
|
},
|
|
},
|
|
{
|
|
name: "importpubkey",
|
|
newCmd: func() (interface{}, error) {
|
|
return btcjson.NewCmd("importpubkey", "031234")
|
|
},
|
|
staticCmd: func() interface{} {
|
|
return btcjson.NewImportPubKeyCmd("031234", nil)
|
|
},
|
|
marshalled: `{"jsonrpc":"1.0","method":"importpubkey","params":["031234"],"id":1}`,
|
|
unmarshalled: &btcjson.ImportPubKeyCmd{
|
|
PubKey: "031234",
|
|
Rescan: btcjson.Bool(true),
|
|
},
|
|
},
|
|
{
|
|
name: "importpubkey optional",
|
|
newCmd: func() (interface{}, error) {
|
|
return btcjson.NewCmd("importpubkey", "031234", false)
|
|
},
|
|
staticCmd: func() interface{} {
|
|
return btcjson.NewImportPubKeyCmd("031234", btcjson.Bool(false))
|
|
},
|
|
marshalled: `{"jsonrpc":"1.0","method":"importpubkey","params":["031234",false],"id":1}`,
|
|
unmarshalled: &btcjson.ImportPubKeyCmd{
|
|
PubKey: "031234",
|
|
Rescan: btcjson.Bool(false),
|
|
},
|
|
},
|
|
{
|
|
name: "importwallet",
|
|
newCmd: func() (interface{}, error) {
|
|
return btcjson.NewCmd("importwallet", "filename")
|
|
},
|
|
staticCmd: func() interface{} {
|
|
return btcjson.NewImportWalletCmd("filename")
|
|
},
|
|
marshalled: `{"jsonrpc":"1.0","method":"importwallet","params":["filename"],"id":1}`,
|
|
unmarshalled: &btcjson.ImportWalletCmd{
|
|
Filename: "filename",
|
|
},
|
|
},
|
|
{
|
|
name: "renameaccount",
|
|
newCmd: func() (interface{}, error) {
|
|
return btcjson.NewCmd("renameaccount", "oldacct", "newacct")
|
|
},
|
|
staticCmd: func() interface{} {
|
|
return btcjson.NewRenameAccountCmd("oldacct", "newacct")
|
|
},
|
|
marshalled: `{"jsonrpc":"1.0","method":"renameaccount","params":["oldacct","newacct"],"id":1}`,
|
|
unmarshalled: &btcjson.RenameAccountCmd{
|
|
OldAccount: "oldacct",
|
|
NewAccount: "newacct",
|
|
},
|
|
},
|
|
}
|
|
|
|
t.Logf("Running %d tests", len(tests))
|
|
for i, test := range tests {
|
|
// Marshal the command as created by the new static command
|
|
// creation function.
|
|
marshalled, err := btcjson.MarshalCmd(testID, test.staticCmd())
|
|
if err != nil {
|
|
t.Errorf("MarshalCmd #%d (%s) unexpected error: %v", i,
|
|
test.name, err)
|
|
continue
|
|
}
|
|
|
|
if !bytes.Equal(marshalled, []byte(test.marshalled)) {
|
|
t.Errorf("Test #%d (%s) unexpected marshalled data - "+
|
|
"got %s, want %s", i, test.name, marshalled,
|
|
test.marshalled)
|
|
continue
|
|
}
|
|
|
|
// Ensure the command is created without error via the generic
|
|
// new command creation function.
|
|
cmd, err := test.newCmd()
|
|
if err != nil {
|
|
t.Errorf("Test #%d (%s) unexpected NewCmd error: %v ",
|
|
i, test.name, err)
|
|
}
|
|
|
|
// Marshal the command as created by the generic new command
|
|
// creation function.
|
|
marshalled, err = btcjson.MarshalCmd(testID, cmd)
|
|
if err != nil {
|
|
t.Errorf("MarshalCmd #%d (%s) unexpected error: %v", i,
|
|
test.name, err)
|
|
continue
|
|
}
|
|
|
|
if !bytes.Equal(marshalled, []byte(test.marshalled)) {
|
|
t.Errorf("Test #%d (%s) unexpected marshalled data - "+
|
|
"got %s, want %s", i, test.name, marshalled,
|
|
test.marshalled)
|
|
continue
|
|
}
|
|
|
|
var request btcjson.Request
|
|
if err := json.Unmarshal(marshalled, &request); err != nil {
|
|
t.Errorf("Test #%d (%s) unexpected error while "+
|
|
"unmarshalling JSON-RPC request: %v", i,
|
|
test.name, err)
|
|
continue
|
|
}
|
|
|
|
cmd, err = btcjson.UnmarshalCmd(&request)
|
|
if err != nil {
|
|
t.Errorf("UnmarshalCmd #%d (%s) unexpected error: %v", i,
|
|
test.name, err)
|
|
continue
|
|
}
|
|
|
|
if !reflect.DeepEqual(cmd, test.unmarshalled) {
|
|
t.Errorf("Test #%d (%s) unexpected unmarshalled command "+
|
|
"- got %s, want %s", i, test.name,
|
|
fmt.Sprintf("(%T) %+[1]v", cmd),
|
|
fmt.Sprintf("(%T) %+[1]v\n", test.unmarshalled))
|
|
continue
|
|
}
|
|
}
|
|
}
|