Update btcscript import paths to new location.

chainntfns.go

@@ -17,8 +17,8 @@
 package main
 
 import (
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"

createtx.go

@@ -24,9 +24,9 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcchain"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
 )

createtx_test.go

@@ -6,9 +6,9 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
 )

createtx_test_disabled.go

@@ -12,9 +12,9 @@ package main
 import (
 	"testing"
 
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/tx"
 )
 

keystore/keystore.go

@@ -38,9 +38,9 @@ import (
 
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/rename"
 )
 

keystore/keystore_test.go

@@ -25,9 +25,9 @@ import (
 
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 
 	"github.com/davecgh/go-spew/spew"
 )

rpcserver.go

@@ -39,11 +39,11 @@ import (
 
 	"github.com/btcsuite/btcec"
 	"github.com/btcsuite/btcrpcclient"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
 	"github.com/btcsuite/websocket"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"

txstore/json.go

@@ -19,9 +19,9 @@ package txstore
 import (
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcjson"
-	"github.com/conformal/btcscript"
 )
 
 // ToJSON returns a slice of btcjson listtransactions result types for all credits

txstore/tx.go

@@ -26,9 +26,9 @@ import (
 
 	"github.com/btcsuite/btcchain"
 	"github.com/btcsuite/btcnet"
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwire"
-	"github.com/conformal/btcscript"
 )
 
 var (

votingpool/pool.go

@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/btcsuite/btcscript"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcutil/hdkeychain"
-	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwallet/waddrmgr"
 	"github.com/conformal/btcwallet/walletdb"
 )