From 644ee0a2442b65273a6c3bbfdfc57417d07d78f2 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 19 Oct 2015 01:25:56 +1100
Subject: [PATCH] bencode: Tidy up

---
 bencode/encode.go      | 15 ++++++++-------
 bencode/encode_test.go | 15 +++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bencode/encode.go b/bencode/encode.go
index 196aa095..d39fac0d 100644
--- a/bencode/encode.go
+++ b/bencode/encode.go
@@ -1,11 +1,13 @@
 package bencode
 
-import "bufio"
-import "reflect"
-import "runtime"
-import "strconv"
-import "sync"
-import "sort"
+import (
+	"bufio"
+	"reflect"
+	"runtime"
+	"sort"
+	"strconv"
+	"sync"
+)
 
 func is_empty_value(v reflect.Value) bool {
 	switch v.Kind() {
@@ -138,7 +140,6 @@ func (e *encoder) reflect_value(v reflect.Value) {
 			if ef.omit_empty && is_empty_value(field_value) {
 				continue
 			}
-
 			e.reflect_string(ef.tag)
 			e.reflect_value(field_value)
 		}
diff --git a/bencode/encode_test.go b/bencode/encode_test.go
index ba191733..a6b2dfd8 100644
--- a/bencode/encode_test.go
+++ b/bencode/encode_test.go
@@ -1,6 +1,10 @@
 package bencode
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
 import "bytes"
 import "fmt"
 
@@ -57,12 +61,7 @@ var random_encode_tests = []random_encode_test{
 func TestRandomEncode(t *testing.T) {
 	for _, test := range random_encode_tests {
 		data, err := Marshal(test.value)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !bytes.Equal(data, []byte(test.expected)) {
-			t.Errorf("got: %s, expected: %s\n",
-				string(data), string(test.expected))
-		}
+		assert.NoError(t, err)
+		assert.EqualValues(t, test.expected, string(data))
 	}
 }
-- 
2.48.1