From 112cbd3bfab03407d0b0ed032655140b6f54d42b Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sun, 18 Apr 2021 22:48:54 +0800 Subject: [PATCH] modify method name --- pkg/utils/datetimes.go | 16 ++++++++-------- pkg/utils/datetimes_test.go | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/utils/datetimes.go b/pkg/utils/datetimes.go index 53dbd43e..6f9dc97f 100644 --- a/pkg/utils/datetimes.go +++ b/pkg/utils/datetimes.go @@ -14,12 +14,12 @@ const ( // FormatUnixTimeToLongDateTimeInServerTimezone returns a textual representation of the unix time formatted by long date time format func FormatUnixTimeToLongDateTimeInServerTimezone(unixTime int64) string { - return ParseFromUnixTime(unixTime).Format(longDateTimeFormat) + return parseFromUnixTime(unixTime).Format(longDateTimeFormat) } // FormatUnixTimeToLongDateTimeWithoutSecond returns a textual representation of the unix time formatted by long date time format (no second) func FormatUnixTimeToLongDateTimeWithoutSecond(unixTime int64, timezone *time.Location) string { - t := ParseFromUnixTime(unixTime) + t := parseFromUnixTime(unixTime) if timezone != nil { t = t.In(timezone) @@ -30,7 +30,7 @@ func FormatUnixTimeToLongDateTimeWithoutSecond(unixTime int64, timezone *time.Lo // FormatUnixTimeToYearMonth returns year and month of specified unix time func FormatUnixTimeToYearMonth(unixTime int64, timezone *time.Location) string { - t := ParseFromUnixTime(unixTime) + t := parseFromUnixTime(unixTime) if timezone != nil { t = t.In(timezone) @@ -39,11 +39,6 @@ func FormatUnixTimeToYearMonth(unixTime int64, timezone *time.Location) string { return t.Format(yearMonthDateTimeFormat) } -// ParseFromUnixTime parses a unix time and returns a golang time struct -func ParseFromUnixTime(unixTime int64) time.Time { - return time.Unix(unixTime, 0) -} - // ParseFromLongDateTime parses a formatted string in long date time format func ParseFromLongDateTime(t string, utcOffset int16) (time.Time, error) { timezone := time.FixedZone("Timezone", int(utcOffset)*60) @@ -88,3 +83,8 @@ func GetMaxTransactionTimeFromUnixTime(unixTime int64) int64 { func GetUnixTimeFromTransactionTime(transactionTime int64) int64 { return transactionTime / 1000 } + +// parseFromUnixTime parses a unix time and returns a golang time struct +func parseFromUnixTime(unixTime int64) time.Time { + return time.Unix(unixTime, 0) +} diff --git a/pkg/utils/datetimes_test.go b/pkg/utils/datetimes_test.go index 364a1967..4ec1f214 100644 --- a/pkg/utils/datetimes_test.go +++ b/pkg/utils/datetimes_test.go @@ -35,13 +35,6 @@ func TestFormatUnixTimeToYearMonth(t *testing.T) { assert.Equal(t, expectedValue, actualValue) } -func TestParseFromUnixTime(t *testing.T) { - expectedValue := int64(1617228083) - actualTime := ParseFromUnixTime(expectedValue) - actualValue := actualTime.Unix() - assert.Equal(t, expectedValue, actualValue) -} - func TestParseFromLongDateTime(t *testing.T) { expectedValue := int64(1617228083) actualTime, err := ParseFromLongDateTime("2021-04-01 06:01:23", 480) @@ -99,3 +92,10 @@ func TestGetUnixTimeFromTransactionTime(t *testing.T) { actualValue := GetUnixTimeFromTransactionTime(1617228083999) assert.Equal(t, expectedValue, actualValue) } + +func TestParseFromUnixTime(t *testing.T) { + expectedValue := int64(1617228083) + actualTime := parseFromUnixTime(expectedValue) + actualValue := actualTime.Unix() + assert.Equal(t, expectedValue, actualValue) +}