From 85cc323e34e694615c4364ebe97010d7c3197952 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Sat, 26 Jul 2014 17:53:35 -0500 Subject: [PATCH] Remove GetAddressBalanceCmd. Support for this extension request has been removed from btcwallet and will not be returning. --- cmds.go | 113 ------------------------ cmds_test.go | 27 ------ test_coverage.txt | 218 ++++++++++++++++++++++------------------------ 3 files changed, 106 insertions(+), 252 deletions(-) diff --git a/cmds.go b/cmds.go index d22c2a10..898e5d18 100644 --- a/cmds.go +++ b/cmds.go @@ -27,8 +27,6 @@ func init() { parseCreateEncryptedWalletCmd, nil, `TODO(jrick) fillmein`) btcjson.RegisterCustomCmd("exportwatchingwallet", parseExportWatchingWalletCmd, nil, `TODO(jrick) fillmein`) - btcjson.RegisterCustomCmd("getaddressbalance", - parseGetAddressBalanceCmd, nil, `TODO(jrick) fillmein`) btcjson.RegisterCustomCmd("getbestblock", parseGetBestBlockCmd, parseGetBestBlockCmdReply, `TODO(jrick) fillmein`) btcjson.RegisterCustomCmd("getcurrentnet", parseGetCurrentNetCmd, nil, @@ -1481,114 +1479,3 @@ func (cmd *ListAllTransactionsCmd) UnmarshalJSON(b []byte) error { *cmd = *concreteCmd return nil } - -// GetAddressBalanceCmd is a type handling custom marshaling -// and unmarshaling of getaddressbalance JSON websocket extension -// commands. -type GetAddressBalanceCmd struct { - id interface{} - Address string - Minconf int -} - -// Enforce that GetAddressBalanceCmd satisifies the btcjson.Cmd -// interface. -var _ btcjson.Cmd = &GetAddressBalanceCmd{} - -// parseGetAddressBalanceCmd parses a GetAddressBalanceCmd into a concrete -// type satisifying the btcjson.Cmd interface. This is used when -// registering the custom command with the btcjson parser. -func parseGetAddressBalanceCmd(r *btcjson.RawCmd) (btcjson.Cmd, error) { - // Length of param slice must be minimum 1 (one required parameter) - // and maximum 2 (1 optional parameter). - if len(r.Params) < 1 || len(r.Params) > 2 { - return nil, btcjson.ErrInvalidParams - } - - var address string - if err := json.Unmarshal(r.Params[0], &address); err != nil { - return nil, errors.New("first parameter 'address' must be a " + - " string: " + err.Error()) - } - - optArgs := make([]int, 0, 1) - if len(r.Params) > 1 { - var minConf int - if err := json.Unmarshal(r.Params[1], &minConf); err != nil { - return nil, errors.New("second optional parameter " + - " 'minconf' must be an integer: " + err.Error()) - } - optArgs = append(optArgs, minConf) - } - - return NewGetAddressBalanceCmd(r.Id, address, optArgs...) -} - -// NewGetAddressBalanceCmd creates a new GetAddressBalanceCmd. -func NewGetAddressBalanceCmd(id interface{}, address string, - optArgs ...int) (*GetAddressBalanceCmd, error) { - - // Optional arguments set to their default values. - minconf := 1 - - if len(optArgs) > 1 { - return nil, btcjson.ErrInvalidParams - } - - if len(optArgs) == 1 { - minconf = optArgs[0] - } - - return &GetAddressBalanceCmd{ - id: id, - Address: address, - Minconf: minconf, - }, nil -} - -// Id satisifies the Cmd interface by returning the ID of the command. -func (cmd *GetAddressBalanceCmd) Id() interface{} { - return cmd.id -} - -// Method satisfies the Cmd interface by returning the RPC method. -func (cmd *GetAddressBalanceCmd) Method() string { - return "getaddressbalance" -} - -// MarshalJSON returns the JSON encoding of cmd. Part of the Cmd interface. -func (cmd *GetAddressBalanceCmd) MarshalJSON() ([]byte, error) { - params := make([]interface{}, 1, 2) - params[0] = cmd.Address - if cmd.Minconf != 1 { - params = append(params, cmd.Minconf) - } - - raw, err := btcjson.NewRawCmd(cmd.id, cmd.Method(), params) - if err != nil { - return nil, err - } - return json.Marshal(raw) -} - -// UnmarshalJSON unmarshals the JSON encoding of cmd into cmd. Part of -// the Cmd interface. -func (cmd *GetAddressBalanceCmd) UnmarshalJSON(b []byte) error { - // Unmarshal into a RawCmd. - var r btcjson.RawCmd - if err := json.Unmarshal(b, &r); err != nil { - return err - } - - newCmd, err := parseGetAddressBalanceCmd(&r) - if err != nil { - return err - } - - concreteCmd, ok := newCmd.(*GetAddressBalanceCmd) - if !ok { - return btcjson.ErrInternal - } - *cmd = *concreteCmd - return nil -} diff --git a/cmds_test.go b/cmds_test.go index 5c9f8e2b..f02d6a10 100644 --- a/cmds_test.go +++ b/cmds_test.go @@ -30,33 +30,6 @@ var cmdtests = []struct { Passphrase: "banana", }, }, - { - name: "getaddressbalance no optargs", - f: func() (btcjson.Cmd, error) { - return NewGetAddressBalanceCmd( - float64(1), - "17XhEvq9Nahdj7Xe1nv6oRe1tEmaHUuynH") - }, - result: &GetAddressBalanceCmd{ - id: float64(1), - Address: "17XhEvq9Nahdj7Xe1nv6oRe1tEmaHUuynH", - Minconf: 1, - }, - }, - { - name: "getaddressbalance one optarg", - f: func() (btcjson.Cmd, error) { - return NewGetAddressBalanceCmd( - float64(1), - "17XhEvq9Nahdj7Xe1nv6oRe1tEmaHUuynH", - 0) - }, - result: &GetAddressBalanceCmd{ - id: float64(1), - Address: "17XhEvq9Nahdj7Xe1nv6oRe1tEmaHUuynH", - Minconf: 0, - }, - }, { name: "getbestblock", f: func() (btcjson.Cmd, error) { diff --git a/test_coverage.txt b/test_coverage.txt index 93d43c01..5748bc33 100644 --- a/test_coverage.txt +++ b/test_coverage.txt @@ -1,176 +1,170 @@ -github.com/conformal/btcws/cmds.go init 100.00% (16/16) +github.com/conformal/btcws/cmds.go init 100.00% (15/15) github.com/conformal/btcws/notifications.go init 100.00% (12/12) -github.com/conformal/btcws/cmds.go GetUnconfirmedBalanceCmd.Id 100.00% (1/1) +github.com/conformal/btcws/notifications.go TxAcceptedVerboseNtfn.Id 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewTxAcceptedVerboseNtfn 100.00% (1/1) +github.com/conformal/btcws/notifications.go TxAcceptedNtfn.Method 100.00% (1/1) github.com/conformal/btcws/cmds.go NewGetCurrentNetCmd 100.00% (1/1) +github.com/conformal/btcws/notifications.go TxAcceptedNtfn.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go GetCurrentNetCmd.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go GetCurrentNetCmd.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewTxAcceptedNtfn 100.00% (1/1) github.com/conformal/btcws/cmds.go GetUnconfirmedBalanceCmd.Method 100.00% (1/1) -github.com/conformal/btcws/cmds.go NewGetBestBlockCmd 100.00% (1/1) -github.com/conformal/btcws/cmds.go GetBestBlockCmd.Id 100.00% (1/1) -github.com/conformal/btcws/cmds.go GetBestBlockCmd.Method 100.00% (1/1) -github.com/conformal/btcws/cmds.go RescanCmd.Id 100.00% (1/1) -github.com/conformal/btcws/cmds.go RescanCmd.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewAccountBalanceNtfn 100.00% (1/1) github.com/conformal/btcws/cmds.go NewNotifyReceivedCmd 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewBtcdConnectedNtfn 100.00% (1/1) github.com/conformal/btcws/cmds.go NotifyReceivedCmd.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go NotifyReceivedCmd.Method 100.00% (1/1) github.com/conformal/btcws/cmds.go NotifyNewTransactionsCmd.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go NotifyNewTransactionsCmd.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go BlockDisconnectedNtfn.Method 100.00% (1/1) github.com/conformal/btcws/cmds.go NewNotifySpentCmd 100.00% (1/1) +github.com/conformal/btcws/notifications.go BlockDisconnectedNtfn.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go NotifySpentCmd.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go NotifySpentCmd.Method 100.00% (1/1) -github.com/conformal/btcws/cmds.go NewCreateEncryptedWalletCmd 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewBlockDisconnectedNtfn 100.00% (1/1) github.com/conformal/btcws/cmds.go CreateEncryptedWalletCmd.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go CreateEncryptedWalletCmd.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go BlockConnectedNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewBlockConnectedNtfn 100.00% (1/1) github.com/conformal/btcws/cmds.go WalletIsLockedCmd.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go WalletIsLockedCmd.Method 100.00% (1/1) -github.com/conformal/btcws/cmds.go ListAddressTransactionsCmd.Id 100.00% (1/1) -github.com/conformal/btcws/cmds.go ListAddressTransactionsCmd.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewBlockConnectedNtfn 100.00% (1/1) -github.com/conformal/btcws/cmds.go ListAllTransactionsCmd.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go ListAllTransactionsCmd.Method 100.00% (1/1) -github.com/conformal/btcws/cmds.go GetAddressBalanceCmd.Id 100.00% (1/1) -github.com/conformal/btcws/cmds.go GetAddressBalanceCmd.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewAccountBalanceNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go AccountBalanceNtfn.Id 100.00% (1/1) github.com/conformal/btcws/notifications.go AccountBalanceNtfn.Method 100.00% (1/1) github.com/conformal/btcws/notifications.go BlockConnectedNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go BlockConnectedNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewBlockDisconnectedNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go BlockDisconnectedNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go BlockDisconnectedNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewBtcdConnectedNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go BtcdConnectedNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go BtcdConnectedNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewRecvTxNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go RecvTxNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go RecvTxNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewRedeemingTxNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go RedeemingTxNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go RedeemingTxNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewRescanFinishedNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go RescanFinishedNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go RescanFinishedNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewRescanProgressNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go RescanProgressNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go RescanProgressNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewTxNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go TxNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go TxNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewWalletLockStateNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go WalletLockStateNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go WalletLockStateNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewTxAcceptedNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go TxAcceptedNtfn.Id 100.00% (1/1) -github.com/conformal/btcws/notifications.go TxAcceptedNtfn.Method 100.00% (1/1) -github.com/conformal/btcws/notifications.go NewTxAcceptedVerboseNtfn 100.00% (1/1) -github.com/conformal/btcws/notifications.go TxAcceptedVerboseNtfn.Id 100.00% (1/1) +github.com/conformal/btcws/cmds.go ListAddressTransactionsCmd.Id 100.00% (1/1) +github.com/conformal/btcws/cmds.go ListAddressTransactionsCmd.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go AccountBalanceNtfn.Id 100.00% (1/1) github.com/conformal/btcws/notifications.go TxAcceptedVerboseNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/cmds.go ListAllTransactionsCmd.Id 100.00% (1/1) +github.com/conformal/btcws/cmds.go NewCreateEncryptedWalletCmd 100.00% (1/1) +github.com/conformal/btcws/notifications.go WalletLockStateNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go WalletLockStateNtfn.Id 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewWalletLockStateNtfn 100.00% (1/1) +github.com/conformal/btcws/notifications.go TxNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go TxNtfn.Id 100.00% (1/1) +github.com/conformal/btcws/cmds.go GetUnconfirmedBalanceCmd.Id 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewTxNtfn 100.00% (1/1) +github.com/conformal/btcws/cmds.go NewGetBestBlockCmd 100.00% (1/1) +github.com/conformal/btcws/notifications.go RescanProgressNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/cmds.go GetBestBlockCmd.Id 100.00% (1/1) +github.com/conformal/btcws/cmds.go GetBestBlockCmd.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go RescanProgressNtfn.Id 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewRescanProgressNtfn 100.00% (1/1) +github.com/conformal/btcws/notifications.go RescanFinishedNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go RescanFinishedNtfn.Id 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewRescanFinishedNtfn 100.00% (1/1) +github.com/conformal/btcws/notifications.go RedeemingTxNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go RedeemingTxNtfn.Id 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewRedeemingTxNtfn 100.00% (1/1) +github.com/conformal/btcws/cmds.go RescanCmd.Id 100.00% (1/1) +github.com/conformal/btcws/cmds.go RescanCmd.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go RecvTxNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go RecvTxNtfn.Id 100.00% (1/1) +github.com/conformal/btcws/notifications.go NewRecvTxNtfn 100.00% (1/1) +github.com/conformal/btcws/notifications.go BtcdConnectedNtfn.Method 100.00% (1/1) +github.com/conformal/btcws/notifications.go BtcdConnectedNtfn.Id 100.00% (1/1) github.com/conformal/btcws/cmds.go RescanCmd.MarshalJSON 90.00% (9/10) github.com/conformal/btcws/notifications.go RecvTxNtfn.MarshalJSON 87.50% (7/8) -github.com/conformal/btcws/cmds.go ListAddressTransactionsCmd.MarshalJSON 87.50% (7/8) -github.com/conformal/btcws/cmds.go GetAddressBalanceCmd.MarshalJSON 87.50% (7/8) github.com/conformal/btcws/notifications.go RedeemingTxNtfn.MarshalJSON 87.50% (7/8) -github.com/conformal/btcws/cmds.go NewNotifyNewTransactionsCmd 85.71% (6/7) -github.com/conformal/btcws/cmds.go GetUnconfirmedBalanceCmd.MarshalJSON 85.71% (6/7) -github.com/conformal/btcws/cmds.go WalletIsLockedCmd.MarshalJSON 85.71% (6/7) +github.com/conformal/btcws/cmds.go ListAddressTransactionsCmd.MarshalJSON 87.50% (7/8) github.com/conformal/btcws/cmds.go ListAllTransactionsCmd.MarshalJSON 85.71% (6/7) -github.com/conformal/btcws/cmds.go NewGetAddressBalanceCmd 83.33% (5/6) +github.com/conformal/btcws/cmds.go NewNotifyNewTransactionsCmd 85.71% (6/7) +github.com/conformal/btcws/cmds.go WalletIsLockedCmd.MarshalJSON 85.71% (6/7) +github.com/conformal/btcws/cmds.go GetUnconfirmedBalanceCmd.MarshalJSON 85.71% (6/7) github.com/conformal/btcws/cmds.go NewGetUnconfirmedBalanceCmd 83.33% (5/6) -github.com/conformal/btcws/cmds.go NewRescanCmd 83.33% (5/6) github.com/conformal/btcws/cmds.go NewListAllTransactionsCmd 83.33% (5/6) -github.com/conformal/btcws/cmds.go NewWalletIsLockedCmd 83.33% (5/6) github.com/conformal/btcws/cmds.go NewListAddressTransactionsCmd 83.33% (5/6) -github.com/conformal/btcws/notifications.go TxAcceptedNtfn.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/notifications.go AccountBalanceNtfn.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/notifications.go BlockConnectedNtfn.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/notifications.go RescanFinishedNtfn.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/cmds.go NotifyNewTransactionsCmd.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/cmds.go NotifySpentCmd.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/cmds.go NotifyReceivedCmd.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/notifications.go TxNtfn.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/notifications.go RescanProgressNtfn.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/cmds.go CreateEncryptedWalletCmd.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/notifications.go BtcdConnectedNtfn.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/notifications.go TxAcceptedVerboseNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/cmds.go NewRescanCmd 83.33% (5/6) +github.com/conformal/btcws/cmds.go NewWalletIsLockedCmd 83.33% (5/6) github.com/conformal/btcws/notifications.go BlockDisconnectedNtfn.MarshalJSON 80.00% (4/5) github.com/conformal/btcws/notifications.go WalletLockStateNtfn.MarshalJSON 80.00% (4/5) -github.com/conformal/btcws/cmds.go parseNotifyNewTransactionsCmd 77.78% (7/9) +github.com/conformal/btcws/notifications.go TxAcceptedVerboseNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/notifications.go TxNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/notifications.go AccountBalanceNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/notifications.go TxAcceptedNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/notifications.go BlockConnectedNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/cmds.go NotifyNewTransactionsCmd.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/notifications.go RescanProgressNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/notifications.go BtcdConnectedNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/cmds.go CreateEncryptedWalletCmd.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/notifications.go RescanFinishedNtfn.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/cmds.go NotifySpentCmd.MarshalJSON 80.00% (4/5) +github.com/conformal/btcws/cmds.go NotifyReceivedCmd.MarshalJSON 80.00% (4/5) github.com/conformal/btcws/cmds.go parseGetUnconfirmedBalanceCmd 77.78% (7/9) +github.com/conformal/btcws/cmds.go parseNotifyNewTransactionsCmd 77.78% (7/9) github.com/conformal/btcws/cmds.go parseListAllTransactionsCmd 77.78% (7/9) github.com/conformal/btcws/cmds.go parseListAddressTransactionsCmd 75.00% (9/12) -github.com/conformal/btcws/cmds.go parseGetAddressBalanceCmd 75.00% (9/12) github.com/conformal/btcws/cmds.go parseWalletIsLockedCmd 75.00% (6/8) -github.com/conformal/btcws/cmds.go GetBestBlockCmd.MarshalJSON 75.00% (3/4) github.com/conformal/btcws/cmds.go GetCurrentNetCmd.MarshalJSON 75.00% (3/4) -github.com/conformal/btcws/notifications.go TxAcceptedVerboseNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go NotifySpentCmd.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go CreateEncryptedWalletCmd.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/notifications.go RecvTxNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go ListAddressTransactionsCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go GetBestBlockCmd.MarshalJSON 75.00% (3/4) github.com/conformal/btcws/notifications.go TxNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go ListAllTransactionsCmd.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/notifications.go RedeemingTxNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go GetAddressBalanceCmd.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/notifications.go AccountBalanceNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/notifications.go RescanFinishedNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go GetCurrentNetCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go ListAddressTransactionsCmd.UnmarshalJSON 72.73% (8/11) github.com/conformal/btcws/cmds.go WalletIsLockedCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go AccountBalanceNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go CreateEncryptedWalletCmd.UnmarshalJSON 72.73% (8/11) github.com/conformal/btcws/notifications.go BlockConnectedNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go GetUnconfirmedBalanceCmd.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/notifications.go TxAcceptedNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go GetBestBlockCmd.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go RescanCmd.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/notifications.go BlockDisconnectedNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/notifications.go WalletLockStateNtfn.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/cmds.go NotifyReceivedCmd.UnmarshalJSON 72.73% (8/11) -github.com/conformal/btcws/notifications.go RescanProgressNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go NotifySpentCmd.UnmarshalJSON 72.73% (8/11) github.com/conformal/btcws/cmds.go NotifyNewTransactionsCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go NotifyReceivedCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go BlockDisconnectedNtfn.UnmarshalJSON 72.73% (8/11) github.com/conformal/btcws/notifications.go BtcdConnectedNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go RescanCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go RecvTxNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go RedeemingTxNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go ListAllTransactionsCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go RescanFinishedNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go GetBestBlockCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go RescanProgressNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go GetUnconfirmedBalanceCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/cmds.go GetCurrentNetCmd.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go WalletLockStateNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go TxAcceptedVerboseNtfn.UnmarshalJSON 72.73% (8/11) +github.com/conformal/btcws/notifications.go TxAcceptedNtfn.UnmarshalJSON 72.73% (8/11) github.com/conformal/btcws/cmds.go parseRescanCmd 72.22% (13/18) github.com/conformal/btcws/notifications.go parseRecvTxNtfn 66.67% (8/12) github.com/conformal/btcws/notifications.go parseRedeemingTxNtfn 66.67% (8/12) -github.com/conformal/btcws/cmds.go parseNotifyReceivedCmd 66.67% (4/6) -github.com/conformal/btcws/cmds.go parseCreateEncryptedWalletCmd 66.67% (4/6) github.com/conformal/btcws/cmds.go parseNotifySpentCmd 66.67% (4/6) -github.com/conformal/btcws/cmds.go parseGetBestBlockCmd 66.67% (2/3) +github.com/conformal/btcws/cmds.go parseCreateEncryptedWalletCmd 66.67% (4/6) +github.com/conformal/btcws/cmds.go parseNotifyReceivedCmd 66.67% (4/6) github.com/conformal/btcws/cmds.go parseGetCurrentNetCmd 66.67% (2/3) +github.com/conformal/btcws/cmds.go parseGetBestBlockCmd 66.67% (2/3) +github.com/conformal/btcws/notifications.go parseRescanProgressNtfn 64.29% (9/14) +github.com/conformal/btcws/notifications.go parseRescanFinishedNtfn 64.29% (9/14) github.com/conformal/btcws/notifications.go parseAccountBalanceNtfn 64.29% (9/14) -github.com/conformal/btcws/notifications.go parseTxAcceptedNtfn 63.64% (7/11) -github.com/conformal/btcws/notifications.go parseWalletLockStateNtfn 63.64% (7/11) -github.com/conformal/btcws/notifications.go parseTxNtfn 63.64% (7/11) -github.com/conformal/btcws/notifications.go parseBlockConnectedNtfn 63.64% (7/11) github.com/conformal/btcws/notifications.go parseBlockDisconnectedNtfn 63.64% (7/11) -github.com/conformal/btcws/notifications.go parseRescanProgressNtfn 62.50% (5/8) -github.com/conformal/btcws/notifications.go parseTxAcceptedVerboseNtfn 62.50% (5/8) -github.com/conformal/btcws/notifications.go parseRescanFinishedNtfn 62.50% (5/8) +github.com/conformal/btcws/notifications.go parseWalletLockStateNtfn 63.64% (7/11) +github.com/conformal/btcws/notifications.go parseTxAcceptedNtfn 63.64% (7/11) +github.com/conformal/btcws/notifications.go parseBlockConnectedNtfn 63.64% (7/11) +github.com/conformal/btcws/notifications.go parseTxNtfn 63.64% (7/11) github.com/conformal/btcws/notifications.go parseBtcdConnectedNtfn 62.50% (5/8) +github.com/conformal/btcws/notifications.go parseTxAcceptedVerboseNtfn 62.50% (5/8) github.com/conformal/btcws/cmds.go NewExportWatchingWalletCmd 0.00% (0/15) github.com/conformal/btcws/cmds.go parseExportWatchingWalletCmd 0.00% (0/14) -github.com/conformal/btcws/cmds.go ExportWatchingWalletCmd.UnmarshalJSON 0.00% (0/11) -github.com/conformal/btcws/cmds.go NotifyBlocksCmd.UnmarshalJSON 0.00% (0/11) github.com/conformal/btcws/cmds.go AuthenticateCmd.UnmarshalJSON 0.00% (0/11) github.com/conformal/btcws/cmds.go RecoverAddressesCmd.UnmarshalJSON 0.00% (0/11) -github.com/conformal/btcws/cmds.go ExportWatchingWalletCmd.MarshalJSON 0.00% (0/9) +github.com/conformal/btcws/cmds.go NotifyBlocksCmd.UnmarshalJSON 0.00% (0/11) +github.com/conformal/btcws/cmds.go ExportWatchingWalletCmd.UnmarshalJSON 0.00% (0/11) github.com/conformal/btcws/cmds.go parseRecoverAddressesCmd 0.00% (0/9) github.com/conformal/btcws/cmds.go parseAuthenticateCmd 0.00% (0/9) -github.com/conformal/btcws/cmds.go AuthenticateCmd.MarshalJSON 0.00% (0/5) +github.com/conformal/btcws/cmds.go ExportWatchingWalletCmd.MarshalJSON 0.00% (0/9) github.com/conformal/btcws/cmds.go RecoverAddressesCmd.MarshalJSON 0.00% (0/5) +github.com/conformal/btcws/cmds.go AuthenticateCmd.MarshalJSON 0.00% (0/5) github.com/conformal/btcws/cmds.go parseGetBestBlockCmdReply 0.00% (0/4) -github.com/conformal/btcws/cmds.go NotifyBlocksCmd.MarshalJSON 0.00% (0/4) github.com/conformal/btcws/cmds.go parseListAddressTransactionsCmdReply 0.00% (0/4) +github.com/conformal/btcws/cmds.go NotifyBlocksCmd.MarshalJSON 0.00% (0/4) github.com/conformal/btcws/cmds.go parseNotifyBlocksCmd 0.00% (0/3) -github.com/conformal/btcws/cmds.go NewNotifyBlocksCmd 0.00% (0/1) -github.com/conformal/btcws/cmds.go ExportWatchingWalletCmd.Method 0.00% (0/1) -github.com/conformal/btcws/cmds.go NewAuthenticateCmd 0.00% (0/1) -github.com/conformal/btcws/cmds.go NewOutPointFromWire 0.00% (0/1) -github.com/conformal/btcws/cmds.go AuthenticateCmd.Id 0.00% (0/1) -github.com/conformal/btcws/cmds.go RecoverAddressesCmd.Id 0.00% (0/1) -github.com/conformal/btcws/cmds.go NewRecoverAddressesCmd 0.00% (0/1) -github.com/conformal/btcws/cmds.go RecoverAddressesCmd.Method 0.00% (0/1) github.com/conformal/btcws/cmds.go AuthenticateCmd.Method 0.00% (0/1) +github.com/conformal/btcws/cmds.go AuthenticateCmd.Id 0.00% (0/1) +github.com/conformal/btcws/cmds.go RecoverAddressesCmd.Method 0.00% (0/1) +github.com/conformal/btcws/cmds.go NewNotifyBlocksCmd 0.00% (0/1) +github.com/conformal/btcws/cmds.go NewRecoverAddressesCmd 0.00% (0/1) +github.com/conformal/btcws/cmds.go RecoverAddressesCmd.Id 0.00% (0/1) github.com/conformal/btcws/cmds.go NotifyBlocksCmd.Method 0.00% (0/1) +github.com/conformal/btcws/cmds.go NewOutPointFromWire 0.00% (0/1) github.com/conformal/btcws/cmds.go NotifyBlocksCmd.Id 0.00% (0/1) +github.com/conformal/btcws/cmds.go NewAuthenticateCmd 0.00% (0/1) github.com/conformal/btcws/cmds.go ExportWatchingWalletCmd.Id 0.00% (0/1) -github.com/conformal/btcws ---------------------------------------- 65.49% (592/904) +github.com/conformal/btcws/cmds.go ExportWatchingWalletCmd.Method 0.00% (0/1) +github.com/conformal/btcws ---------------------------------------- 64.84% (568/876)