Import btcws repo into btcjson/btcws directory.

btcsuite · Feb 19, 2015 · 3e800e1 · 3e800e1
1 parent b8f3da6
commit 3e800e1
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 193 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENSE b/LICENSE
diff --git a/README.md → btcjson/btcws/README.md b/README.md → 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 → btcjson/btcws/cmds.go b/cmds.go → 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 → btcjson/btcws/cmds_test.go b/cmds_test.go → btcjson/btcws/cmds_test.go
diff --git a/notifications.go → btcjson/btcws/notifications.go b/notifications.go → btcjson/btcws/notifications.go
diff --git a/notifications_test.go → btcjson/btcws/notifications_test.go b/notifications_test.go → 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