From 3e800e154cf27c0dbaafcde1ef440c50d82160c0 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Thu, 19 Feb 2015 12:50:19 -0600 Subject: [PATCH] Import btcws repo into btcjson/btcws directory. --- .travis.yml | 3 - LICENSE | 13 -- README.md => btcjson/btcws/README.md | 8 +- cmds.go => btcjson/btcws/cmds.go | 2 - cmds_test.go => btcjson/btcws/cmds_test.go | 0 .../btcws/notifications.go | 0 .../btcws/notifications_test.go | 2 +- test_coverage.txt | 170 ------------------ 8 files changed, 5 insertions(+), 193 deletions(-) delete mode 100644 .travis.yml delete mode 100644 LICENSE rename README.md => btcjson/btcws/README.md (90%) rename cmds.go => btcjson/btcws/cmds.go (99%) rename cmds_test.go => btcjson/btcws/cmds_test.go (100%) rename notifications.go => btcjson/btcws/notifications.go (100%) rename notifications_test.go => btcjson/btcws/notifications_test.go (99%) delete mode 100644 test_coverage.txt diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ae71c02f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,3 +0,0 @@ -language: go -go: release -install: go get -d -t -v ./... diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 62a53cea..00000000 --- a/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (c) 2013 Conformal Systems LLC. - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/README.md b/btcjson/btcws/README.md similarity index 90% rename from README.md rename to btcjson/btcws/README.md index 230b6dc2..cd1bb925 100644 --- a/README.md +++ b/btcjson/btcws/README.md @@ -1,7 +1,7 @@ btcws ===== -[![Build Status](https://travis-ci.org/btcsuite/btcws.png?branch=master)] +[![Build Status](https://travis-ci.org/btcsuite/btcd.png?branch=master)] (https://travis-ci.org/btcsuite/btcws) Package btcws implements extensions to the standard bitcoind JSON-RPC @@ -14,7 +14,7 @@ btcjson (using btcjson.RegisterCustomCmd). // Client Side import ( "golang.org/x/net/websocket" - "github.com/btcsuite/btcws" + "github.com/btcsuite/btcd/btcjson/btcws" ) // Create rescan command. @@ -37,7 +37,7 @@ websocket.JSON.Send(btcdWSConn, cmd) import ( "golang.org/x/net/websocket" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcws" + "github.com/btcsuite/btcd/btcjson/btcws" ) // Get marshaled request. @@ -60,7 +60,7 @@ if ok { ## Installation ```bash -$ go get github.com/btcsuite/btcws +$ go get github.com/btcsuite/btcd/btcjson/btcws ``` ## GPG Verification Key diff --git a/cmds.go b/btcjson/btcws/cmds.go similarity index 99% rename from cmds.go rename to btcjson/btcws/cmds.go index faa15c9c..e79df6f3 100644 --- a/cmds.go +++ b/btcjson/btcws/cmds.go @@ -1584,8 +1584,6 @@ func NewListAllTransactionsCmd(id interface{}, if len(optArgs) > 1 { return nil, btcjson.ErrInvalidParams - } else { - account = nil } if len(optArgs) == 1 { diff --git a/cmds_test.go b/btcjson/btcws/cmds_test.go similarity index 100% rename from cmds_test.go rename to btcjson/btcws/cmds_test.go diff --git a/notifications.go b/btcjson/btcws/notifications.go similarity index 100% rename from notifications.go rename to btcjson/btcws/notifications.go diff --git a/notifications_test.go b/btcjson/btcws/notifications_test.go similarity index 99% rename from notifications_test.go rename to btcjson/btcws/notifications_test.go index a63c458d..1df4e2d6 100644 --- a/notifications_test.go +++ b/btcjson/btcws/notifications_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcjson" - "github.com/btcsuite/btcws" + "github.com/btcsuite/btcd/btcjson/btcws" "github.com/davecgh/go-spew/spew" ) diff --git a/test_coverage.txt b/test_coverage.txt deleted file mode 100644 index 5748bc33..00000000 --- a/test_coverage.txt +++ /dev/null @@ -1,170 +0,0 @@ - -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/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/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/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 ListAllTransactionsCmd.Method 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/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/notifications.go RedeemingTxNtfn.MarshalJSON 87.50% (7/8) -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 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 NewListAllTransactionsCmd 83.33% (5/6) -github.com/conformal/btcws/cmds.go NewListAddressTransactionsCmd 83.33% (5/6) -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/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 parseWalletIsLockedCmd 75.00% (6/8) -github.com/conformal/btcws/cmds.go GetCurrentNetCmd.MarshalJSON 75.00% (3/4) -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 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 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 parseNotifySpentCmd 66.67% (4/6) -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 parseBlockDisconnectedNtfn 63.64% (7/11) -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 AuthenticateCmd.UnmarshalJSON 0.00% (0/11) -github.com/conformal/btcws/cmds.go RecoverAddressesCmd.UnmarshalJSON 0.00% (0/11) -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 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 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 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/cmds.go ExportWatchingWalletCmd.Method 0.00% (0/1) -github.com/conformal/btcws ---------------------------------------- 64.84% (568/876) -