1 files changed, 17 insertions, 56 deletions

diff --git a/snowflake_test.go b/snowflake_test.go
index e8c5e7c..e69644c 100644
--- a/snowflake_test.go
+++ b/snowflake_test.go
@@ -6,10 +6,7 @@ import (
 )
 
 func TestNew(t *testing.T) {
-	s, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	s := New()
 	if s.IsZero() {
 		t.Error("New() returned zero Snowflake")
 	}
@@ -19,10 +16,8 @@ func TestNewUnique(t *testing.T) {
 	seen := make(map[string]bool, 1000)
 
 	for i := 0; i < 1000; i++ {
-		s, err := New()
-		if err != nil {
-			t.Fatalf("New() returned error: %v", err)
-		}
+		s := New()
+
 		str := s.String()
 		if seen[str] {
 			t.Fatalf("duplicate ID generated: %s", str)
@@ -37,20 +32,14 @@ func TestIsZero(t *testing.T) {
 		t.Error("Zero Snowflake should be zero")
 	}
 
-	nonZero, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	nonZero := New()
 	if nonZero.IsZero() {
 		t.Error("New Snowflake should not be zero")
 	}
 }
 
 func TestStringRoundTrip(t *testing.T) {
-	original, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	original := New()
 	str := original.String()
 	parsed, err := FromString(str)
 	if err != nil {
@@ -64,10 +53,8 @@ func TestStringRoundTrip(t *testing.T) {
 
 func TestStringRoundTripMany(t *testing.T) {
 	for i := 0; i < 100; i++ {
-		original, err := New()
-		if err != nil {
-			t.Fatalf("New() returned error: %v", err)
-		}
+		original := New()
+
 		str := original.String()
 		parsed, err := FromString(str)
 		if err != nil {
@@ -104,10 +91,7 @@ func TestFromStringTooLong(t *testing.T) {
 }
 
 func TestHexString(t *testing.T) {
-	s, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	s := New()
 	hex := s.Hex()
 
 	if len(hex) != IDByteSize*2 {
@@ -138,10 +122,7 @@ func TestZeroString(t *testing.T) {
 }
 
 func TestHexRoundTrip(t *testing.T) {
-	original, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	original := New()
 	hex := original.Hex()
 	parsed, err := FromHex(hex)
 	if err != nil {
@@ -167,10 +148,7 @@ func TestFromHexWrongLength(t *testing.T) {
 }
 
 func TestMarshalText(t *testing.T) {
-	s, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	s := New()
 	text, err := s.MarshalText()
 	if err != nil {
 		t.Fatalf("MarshalText failed: %v", err)
@@ -196,10 +174,7 @@ func TestUnmarshalTextInvalid(t *testing.T) {
 }
 
 func TestMarshalJSON(t *testing.T) {
-	s, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	s := New()
 	data, err := s.MarshalJSON()
 	if err != nil {
 		t.Fatalf("MarshalJSON failed: %v", err)
@@ -244,10 +219,7 @@ func TestUnmarshalJSONInvalidInner(t *testing.T) {
 }
 
 func TestDriverValue(t *testing.T) {
-	s, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	s := New()
 	val, err := s.Value()
 	if err != nil {
 		t.Fatalf("Value failed: %v", err)
@@ -264,16 +236,12 @@ func TestDriverValue(t *testing.T) {
 }
 
 func TestDriverScan(t *testing.T) {
-	original, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	original := New()
 	bytes := make([]byte, IDByteSize)
 	copy(bytes, original.bytes[:])
 
 	var s Snowflake
-	err = s.Scan(bytes)
-	if err != nil {
+	if err := s.Scan(bytes); err != nil {
 		t.Fatalf("Scan failed: %v", err)
 	}
 
@@ -283,16 +251,12 @@ func TestDriverScan(t *testing.T) {
 }
 
 func TestDriverScanString(t *testing.T) {
-	original, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	original := New()
 	bytes := make([]byte, IDByteSize)
 	copy(bytes, original.bytes[:])
 
 	var s Snowflake
-	err = s.Scan(string(bytes))
-	if err != nil {
+	if err := s.Scan(string(bytes)); err != nil {
 		t.Fatalf("Scan(string) failed: %v", err)
 	}
 
@@ -348,10 +312,7 @@ func TestJSONEmbedding(t *testing.T) {
 		Ref  *Snowflake `json:"ref,omitempty"`
 	}
 
-	s, err := New()
-	if err != nil {
-		t.Fatalf("New() returned error: %v", err)
-	}
+	s := New()
 	w := Wrapper{
 		Name: "test",
 		ID:   s,