From 26cd66f1654148178e7a4af0dede8abfc49a54b9 Mon Sep 17 00:00:00 2001
From: Leonardo Di Donato <leodidonato@gmail.com>
Date: Tue, 24 Jul 2018 12:04:09 +0200
Subject: [PATCH] Update ID generator according to platform.ID

---
 snowflake/id.go      | 8 +-------
 snowflake/id_test.go | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/snowflake/id.go b/snowflake/id.go
index 528dfd849a..6acb6c77da 100644
--- a/snowflake/id.go
+++ b/snowflake/id.go
@@ -1,7 +1,6 @@
 package snowflake
 
 import (
-	"encoding/binary"
 	"math/rand"
 	"time"
 
@@ -9,8 +8,6 @@ import (
 	"github.com/influxdata/platform"
 )
 
-// TODO: rename to id.go
-
 func init() {
 	rand.Seed(time.Now().UnixNano())
 }
@@ -27,8 +24,5 @@ func NewIDGenerator() *IDGenerator {
 }
 
 func (g *IDGenerator) ID() platform.ID {
-	id := make(platform.ID, 8)
-	i := g.Generator.Next()
-	binary.BigEndian.PutUint64(id, i)
-	return id
+	return platform.ID(g.Generator.Next())
 }
diff --git a/snowflake/id_test.go b/snowflake/id_test.go
index ea286292b8..eb9d635d07 100644
--- a/snowflake/id_test.go
+++ b/snowflake/id_test.go
@@ -10,7 +10,7 @@ import (
 func TestIDLength(t *testing.T) {
 	gen := NewIDGenerator()
 	id := gen.ID()
-	if len(id) != 8 {
+	if len(id.Encode()) != 16 {
 		t.Fail()
 	}
 }
@@ -21,7 +21,7 @@ func TestToFromString(t *testing.T) {
 	var clone platform.ID
 	if err := clone.DecodeFromString(id.String()); err != nil {
 		t.Error(err)
-	} else if !bytes.Equal(id, clone) {
+	} else if !bytes.Equal(id.Encode(), clone.Encode()) {
 		t.Errorf("id started as %x but got back %x", id, clone)
 	}
 }