Fix byte-order in uuid1 and uuid6

Author: aminalaee

src/lib.rs

@@ -12,6 +12,7 @@ use std::{
     hash::{Hash, Hasher},
     ptr::null_mut,
     sync::atomic::{AtomicPtr, AtomicU64, Ordering},
+    time::SystemTime,
 };
 use uuid::{Builder, Bytes, Context, Timestamp, Uuid, Variant, Version};
 
@@ -305,13 +306,17 @@ impl UUID {
 #[pyo3(signature = (node=None, clock_seq=None))]
 fn uuid1(node: Option<u64>, clock_seq: Option<u64>) -> PyResult<UUID> {
     let node = match node {
-        Some(node) => node.to_ne_bytes(),
-        None => _getnode().to_ne_bytes(),
+        Some(node) => node.to_be_bytes(),
+        None => _getnode().to_be_bytes(),
     };
-    let node = &[node[0], node[1], node[2], node[3], node[4], node[5]];
+    let node: &[u8; 6] = node[2..8].try_into().unwrap();
     let uuid = match clock_seq {
         Some(clock_seq) => {
-            let ts = Timestamp::from_unix(&Context::new_random(), clock_seq, 0);
+            let dur = SystemTime::now()
+                .duration_since(SystemTime::UNIX_EPOCH)
+                .unwrap();
+            let ts =
+                Timestamp::from_unix_time(dur.as_secs(), dur.subsec_nanos(), clock_seq as u128, 14);
             Uuid::new_v1(ts, node)
         }
         None => Uuid::now_v1(node),
@@ -354,17 +359,16 @@ fn uuid5(namespace: &UUID, name: StringOrBytes) -> PyResult<UUID> {
 #[pyo3(signature = (node=None, timestamp=None, nanos=None))]
 fn uuid6(node: Option<u64>, timestamp: Option<u64>, nanos: Option<u32>) -> PyResult<UUID> {
     let node = match node {
-        Some(node) => node.to_ne_bytes(),
-        None => _getnode().to_ne_bytes(),
+        Some(node) => node.to_be_bytes(),
+        None => _getnode().to_be_bytes(),
     };
-    let node = &[node[0], node[1], node[2], node[3], node[4], node[5]];
+    let node: &[u8; 6] = node[2..8].try_into().unwrap();
 
     let uuid = match timestamp {
         Some(timestamp) => {
-            let timestamp =
-                Timestamp::from_unix(&Context::new_random(), timestamp, nanos.unwrap_or(0));
+            let ts = Timestamp::from_unix(&Context::new_random(), timestamp, nanos.unwrap_or(0));
             return Ok(UUID {
-                uuid: Uuid::new_v6(timestamp, node),
+                uuid: Uuid::new_v6(ts, node),
             });
         }
         None => Uuid::now_v6(node),

tests/test_uuid.py

@@ -70,8 +70,10 @@ def test_uuid1() -> None:
     uuid = uuid_utils.uuid1()
     assert isinstance(uuid, uuid_utils.UUID)
 
-    uuid = uuid_utils.uuid1(node=8155362240700, clock_seq=123)
+    uuid = uuid_utils.uuid1(node=getnode(), clock_seq=123)
     assert isinstance(uuid, uuid_utils.UUID)
+    assert uuid.node == getnode()
+    assert uuid.clock_seq == 123
 
 
 @pytest.mark.parametrize("name", ["python.org", b"python.org"])
@@ -94,9 +96,11 @@ def test_uuid5(name: str) -> None:
 def test_uuid6() -> None:
     uuid = uuid_utils.uuid6(getnode(), 1679665408)
     assert isinstance(uuid, uuid_utils.UUID)
+    assert uuid.node == getnode()
 
     uuid = uuid_utils.uuid6(getnode(), 1679665408, 123)
     assert isinstance(uuid, uuid_utils.UUID)
+    assert uuid.node == getnode()
 
     uuid = uuid_utils.uuid6()
     assert isinstance(uuid, uuid_utils.UUID)
@@ -150,6 +154,8 @@ def test_uuid_version(version: int) -> None:
 def test_uuid_illegal_version() -> None:
     with pytest.raises(ValueError):
         uuid_utils.UUID("a8098c1a-f86e-11da-bd1a-00112444be1e", version=0)
+
+    with pytest.raises(ValueError):
         uuid_utils.UUID("a8098c1a-f86e-11da-bd1a-00112444be1e", version=9)