From 5beafbd2d8be535c6a8f439b08d1c970da25b7bc Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Wed, 2 Jul 2014 19:37:49 -0500
Subject: [PATCH] goimports -w .

---
 address_test.go       | 5 +++--
 internal_test.go      | 5 +++--
 log.go                | 3 ++-
 opcode.go             | 7 ++++---
 opcode_test.go        | 3 ++-
 script.go             | 5 +++--
 script_test.go        | 6 +++---
 scriptbuilder_test.go | 3 ++-
 stack_test.go         | 3 ++-
 9 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/address_test.go b/address_test.go
index f1d546b3..fbd4af76 100644
--- a/address_test.go
+++ b/address_test.go
@@ -5,11 +5,12 @@ package btcscript_test
 
 import (
 	"encoding/hex"
+	"reflect"
+	"testing"
+
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcutil"
-	"reflect"
-	"testing"
 )
 
 // decodeHex decodes the passed hex string and returns the resulting bytes.  It
diff --git a/internal_test.go b/internal_test.go
index 66592235..f973879b 100644
--- a/internal_test.go
+++ b/internal_test.go
@@ -9,12 +9,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcwire"
 	"io/ioutil"
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/conformal/btcutil"
+	"github.com/conformal/btcwire"
 )
 
 // this file is present to export some internal interfaces so that we can
diff --git a/log.go b/log.go
index b1ca42a0..791bc355 100644
--- a/log.go
+++ b/log.go
@@ -6,8 +6,9 @@ package btcscript
 
 import (
 	"errors"
-	"github.com/conformal/btclog"
 	"io"
+
+	"github.com/conformal/btclog"
 )
 
 // log is a logger that is initialized with no output filters.  This
diff --git a/opcode.go b/opcode.go
index d63860bb..24f31acb 100644
--- a/opcode.go
+++ b/opcode.go
@@ -6,17 +6,18 @@ package btcscript
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/ripemd160"
 	"crypto/ecdsa"
 	"crypto/sha1"
 	"encoding/binary"
 	"fmt"
+	"hash"
+	"math/big"
+
+	"code.google.com/p/go.crypto/ripemd160"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcwire"
 	"github.com/conformal/fastsha256"
 	"github.com/davecgh/go-spew/spew"
-	"hash"
-	"math/big"
 )
 
 // An opcode defines the information related to a btcscript opcode.
diff --git a/opcode_test.go b/opcode_test.go
index 2549973c..024f6323 100644
--- a/opcode_test.go
+++ b/opcode_test.go
@@ -6,10 +6,11 @@ package btcscript_test
 
 import (
 	"bytes"
+	"testing"
+
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcwire"
 	"github.com/davecgh/go-spew/spew"
-	"testing"
 )
 
 // test scripts to test as many opcodes as possible.
diff --git a/script.go b/script.go
index 74df6fe7..ac8cfaf9 100644
--- a/script.go
+++ b/script.go
@@ -11,13 +11,14 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"io"
+	"time"
+
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
 	"github.com/davecgh/go-spew/spew"
-	"io"
-	"time"
 )
 
 var (
diff --git a/script_test.go b/script_test.go
index 5c301365..c7d09dd2 100644
--- a/script_test.go
+++ b/script_test.go
@@ -10,13 +10,14 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
+	"math/big"
+	"testing"
+
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
 	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
-	"math/big"
-	"testing"
 )
 
 func TestPushedData(t *testing.T) {
@@ -2935,7 +2936,6 @@ func (b *bogusAddress) String() string {
 	return ""
 }
 
-
 func TestPayToAddrScript(t *testing.T) {
 	// 1MirQ9bwyQcGVJPwKUgapu5ouK2E2Ey4gX
 	p2pkhMain, err := btcutil.NewAddressPubKeyHash([]byte{
diff --git a/scriptbuilder_test.go b/scriptbuilder_test.go
index 847f53b8..41fd2e65 100644
--- a/scriptbuilder_test.go
+++ b/scriptbuilder_test.go
@@ -6,8 +6,9 @@ package btcscript_test
 
 import (
 	"bytes"
-	"github.com/conformal/btcscript"
 	"testing"
+
+	"github.com/conformal/btcscript"
 )
 
 // TestScriptBuilderAddOp tests that pushing opcodes to a script via the
diff --git a/stack_test.go b/stack_test.go
index b9e4059d..0c1781fb 100644
--- a/stack_test.go
+++ b/stack_test.go
@@ -8,9 +8,10 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/conformal/btcscript"
 	"math/big"
 	"testing"
+
+	"github.com/conformal/btcscript"
 )
 
 type stackTest struct {