From 313db86c157a7ddd3f73e05ad05f9499532b52f8 Mon Sep 17 00:00:00 2001 From: Yoshiyuki Mineo Date: Fri, 2 May 2025 02:42:07 +0900 Subject: [PATCH] Remove NewSonyflake --- v2/example/sonyflake_server.go | 7 ++++++- v2/sonyflake.go | 10 ---------- v2/sonyflake_test.go | 6 +++--- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/v2/example/sonyflake_server.go b/v2/example/sonyflake_server.go index 86b2523..ca99ed6 100644 --- a/v2/example/sonyflake_server.go +++ b/v2/example/sonyflake_server.go @@ -2,6 +2,7 @@ package main import ( "encoding/json" + "log" "net/http" "github.com/sony/sonyflake/v2" @@ -13,7 +14,11 @@ var sf *sonyflake.Sonyflake func init() { var st sonyflake.Settings st.MachineID = awsutil.AmazonEC2MachineID - sf = sonyflake.NewSonyflake(st) + var err error +sf, err = sonyflake.New(st) +if err != nil { + log.Fatal(err) +} if sf == nil { panic("sonyflake not created") } diff --git a/v2/sonyflake.go b/v2/sonyflake.go index b514c69..7747b83 100644 --- a/v2/sonyflake.go +++ b/v2/sonyflake.go @@ -98,16 +98,6 @@ func New(st Settings) (*Sonyflake, error) { return sf, nil } -// NewSonyflake returns a new Sonyflake configured with the given Settings. -// NewSonyflake returns nil in the following cases: -// - Settings.StartTime is ahead of the current time. -// - Settings.MachineID returns an error. -// - Settings.CheckMachineID returns false. -func NewSonyflake(st Settings) *Sonyflake { - sf, _ := New(st) - return sf -} - // NextID generates a next unique ID. // After the Sonyflake time overflows, NextID returns an error. // NextID generates a next unique ID as int64. diff --git a/v2/sonyflake_test.go b/v2/sonyflake_test.go index aa72af8..fcb61f6 100644 --- a/v2/sonyflake_test.go +++ b/v2/sonyflake_test.go @@ -21,9 +21,9 @@ func init() { var st Settings st.StartTime = time.Now() - sf = NewSonyflake(st) - if sf == nil { - panic("sonyflake not created") + sf, err := New(st) + if err != nil { + panic(err) } startTime = toSonyflakeTime(st.StartTime)