From 6a4fd70c39541bb235ae5f175ae020c754b8639b Mon Sep 17 00:00:00 2001
From: Jazz Turner-Baggs <473256+jazzz@users.noreply.github.com>
Date: Mon, 24 Nov 2025 18:52:15 -0800
Subject: [PATCH] Fix stale tests

---
 src/naxolotl/naxolotl.nim |  2 +-
 tests/all_tests.nim       |  5 ++++-
 tests/test_curve25519.nim | 20 +++++++++++---------
 tests/test_naxolotl.nim   |  5 +++--
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/naxolotl/naxolotl.nim b/src/naxolotl/naxolotl.nim
index 0163558..15927b5 100644
--- a/src/naxolotl/naxolotl.nim
+++ b/src/naxolotl/naxolotl.nim
@@ -114,7 +114,7 @@ proc skipMessageKeys(self: var Doubleratchet, until: MsgCount): Result[(), strin
 proc encrypt(self: var Doubleratchet, plaintext: var seq[byte], associatedData: openArray[byte]): (DrHeader, CipherText) = 
 
   let (msgKey, chainKey) = self.kdfChain(self.chainKeySend)
-
+  self.chainKeySend = chainKey
   let header = DrHeader(  
                 dhPublic: self.dhSelf.public, #TODO Serialize
                 msgNumber: self.msgCountSend,
diff --git a/tests/all_tests.nim b/tests/all_tests.nim
index f6df9b7..3423962 100644
--- a/tests/all_tests.nim
+++ b/tests/all_tests.nim
@@ -1 +1,4 @@
-# import indivdual test suites
+# import individual test suites
+
+import ./test_curve25519
+import ./test_naxolotl
\ No newline at end of file
diff --git a/tests/test_curve25519.nim b/tests/test_curve25519.nim
index 25a26a2..f0ee519 100644
--- a/tests/test_curve25519.nim
+++ b/tests/test_curve25519.nim
@@ -1,8 +1,8 @@
-# test_example.nim
-import unittest
-import ../src/crypto/ecdh # TODO use config.nims
 import results
-import ../src/utils
+import unittest
+
+import ../src/chat_sdk/crypto/ecdh # TODO use config.nims
+import ../src/chat_sdk/utils
 
 # Key share test from RFC-7748:
 const ks7748_a_priv = "77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a"
@@ -15,6 +15,9 @@ const ks7748_shared_key = "4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09
 
 import parseutils
 
+
+
+
 proc hexToArray*[N: static[int]](hexStr: string): array[N, byte] =
   ## Converts hex string to fixed-size byte array
   if hexStr.len != N * 2:
@@ -26,18 +29,17 @@ proc hexToArray*[N: static[int]](hexStr: string): array[N, byte] =
     if parseHex(hexStr[i*2..i*2+1], result[i]) == 0:
       raise newException(ValueError, "Invalid hex pair: " & hexStr[i*2..i*2+1])
 
-# Usage
 
 suite "X25519":
   test "Key Loading":
 
-    let a_priv = loadKeyFromBytes(hexToArray[32](ks7748_a_priv)).get()
+    let a_priv = loadPrivateKeyFromBytes(hexToArray[32](ks7748_a_priv)).get()
     let a_pub = a_priv.getPublicKey()
 
     check bytesToHex(a_pub.bytes, lowercase = true) == ks7748_a_pub
     check bytesToHex(a_pub.bytes, lowercase = true) != ks7748_b_pub
 
-    let b_priv = loadKeyFromBytes(hexToArray[32](ks7748_b_priv)).get()
+    let b_priv = loadPrivateKeyFromBytes(hexToArray[32](ks7748_b_priv)).get()
     let b_pub = b_priv.getPublicKey()
 
     check bytesToHex(b_pub.bytes, lowercase = true) != ks7748_a_pub
@@ -45,10 +47,10 @@ suite "X25519":
 
   test "ECDH":
 
-    let a_priv = loadKeyFromBytes(hexToArray[32](ks7748_a_priv)).get()
+    let a_priv = loadPrivateKeyFromBytes(hexToArray[32](ks7748_a_priv)).get()
     let a_pub = a_priv.getPublicKey()
 
-    let b_priv = loadKeyFromBytes(hexToArray[32](ks7748_b_priv)).get()
+    let b_priv = loadPrivateKeyFromBytes(hexToArray[32](ks7748_b_priv)).get()
     let b_pub = b_priv.getPublicKey()
 
 
diff --git a/tests/test_naxolotl.nim b/tests/test_naxolotl.nim
index 26ef5e2..acbd824 100644
--- a/tests/test_naxolotl.nim
+++ b/tests/test_naxolotl.nim
@@ -1,13 +1,14 @@
 
 import unittest
-import naxolotl
 import results
 import random
 import sequtils
 
 import strutils
 
-import naxolotl/utils
+import ../src/naxolotl
+import ../src/naxolotl/utils
+
 
 
 # Key share test from RFC-7748: