Skip to content

Moved NewV7FromReader to uuid_test since it shouldn't be used outside of testing #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timmattison wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Moved NewV7FromReader to uuid_test since it shouldn't be used outside of testing #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6d3a8e
Moved NewV7FromReader to uuid_test since it shouldn't be used outside…
timmattison Mar 6, 2024
36e3bce
Additional comment for clarity on the behavior
timmattison Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions uuid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"bytes"
"errors"
"fmt"
"io"
"os"
"runtime"
"strings"
Expand Down Expand Up @@ -884,6 +885,20 @@ func TestVersion7FromReader(t *testing.T) {
}
}

// NewV7FromReader returns a Version 7 UUID based on the current time and uses
// NewRandomFromReader to get bytes 8-15 of the UUID. Bytes 0-7 from the reader
// are read but are overwritten by the makeV7 function.
// On error, NewV7FromReader returns Nil and an error.
func NewV7FromReader(r io.Reader) (UUID, error) {
uuid, err := NewRandomFromReader(r)
if err != nil {
return uuid, err
}

makeV7(uuid[:])
return uuid, nil
}

func TestVersion7Monotonicity(t *testing.T) {
length := 10000
u1 := Must(NewV7()).String()
Expand Down
17 changes: 0 additions & 17 deletions version7.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

package uuid

import (
"io"
)

// UUID version 7 features a time-ordered value field derived from the widely
// implemented and well known Unix Epoch timestamp source,
// the number of milliseconds seconds since midnight 1 Jan 1970 UTC, leap seconds excluded.
Expand All @@ -29,19 +25,6 @@ func NewV7() (UUID, error) {
return uuid, nil
}

// NewV7FromReader returns a Version 7 UUID based on the current time(Unix Epoch).
// it use NewRandomFromReader fill random bits.
// On error, NewV7FromReader returns Nil and an error.
func NewV7FromReader(r io.Reader) (UUID, error) {
uuid, err := NewRandomFromReader(r)
if err != nil {
return uuid, err
}

makeV7(uuid[:])
return uuid, nil
}

// makeV7 fill 48 bits time (uuid[0] - uuid[5]), set version b0111 (uuid[6])
// uuid[8] already has the right version number (Variant is 10)
// see function NewV7 and NewV7FromReader
Expand Down