From b86c7a853e51de9d03127d593c8b3efaece54e50 Mon Sep 17 00:00:00 2001
From: sergeych <real.sergeych@gmail.com>
Date: Tue, 5 Dec 2023 00:57:16 +0300
Subject: [PATCH] fixed tests. better atomic operations

---
 .idea/GitLink.xml                             |  6 ++++
 .idea/gradle.xml                              |  1 +
 build.gradle.kts                              |  2 +-
 .../net/sergeych/tools/AtomicCounter.kt       |  8 ++---
 .../kotlin/net/sergeych/tools/AtomicValue.kt  | 35 +++++++++++++++++++
 src/commonTest/kotlin/KeysTest.kt             | 12 +++----
 6 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 .idea/GitLink.xml
 create mode 100644 src/commonMain/kotlin/net/sergeych/tools/AtomicValue.kt

diff --git a/.idea/GitLink.xml b/.idea/GitLink.xml
new file mode 100644
index 0000000..5143819
--- /dev/null
+++ b/.idea/GitLink.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="uk.co.ben_gibson.git.link.SettingsState">
+    <option name="host" value="e0f86390-1091-4871-8aeb-f534fbc99cf0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f9163b4..ce1c62c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/build.gradle.kts b/build.gradle.kts
index 7393920..9f3f735 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "net.sergeych"
-version = "0.1.0-SNAPSHOT"
+version = "0.1.1-SNAPSHOT"
 
 repositories {
     mavenCentral()
diff --git a/src/commonMain/kotlin/net/sergeych/tools/AtomicCounter.kt b/src/commonMain/kotlin/net/sergeych/tools/AtomicCounter.kt
index b5fc64b..d124318 100644
--- a/src/commonMain/kotlin/net/sergeych/tools/AtomicCounter.kt
+++ b/src/commonMain/kotlin/net/sergeych/tools/AtomicCounter.kt
@@ -1,10 +1,6 @@
 package net.sergeych.tools
 
 @Suppress("unused")
-class AtomicCounter(initialValue: Long = 0) {
- private val op = ProtectedOp()
-    var value: Long = initialValue
-        private set
-
-    fun incrementAndGet(): Long = op { ++value }
+class AtomicCounter(initialValue: Long = 0) : AtomicValue<Long>(initialValue) {
+    fun incrementAndGet(): Long = mutate { it+1 }
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/net/sergeych/tools/AtomicValue.kt b/src/commonMain/kotlin/net/sergeych/tools/AtomicValue.kt
new file mode 100644
index 0000000..a4a5155
--- /dev/null
+++ b/src/commonMain/kotlin/net/sergeych/tools/AtomicValue.kt
@@ -0,0 +1,35 @@
+package net.sergeych.tools
+
+/**
+ * Multiplatform (JS and battery included) atomically mutable value.
+ * Actual value can be either changed in a block of [mutuate] when
+ * new value _depends on the current value_ or use a same [value]
+ * property that is thread-safe where there are threads and just safe
+ * otherwise ;)
+ */
+open class AtomicValue<T>(initialValue: T) {
+    var actualValue = initialValue
+    val op = ProtectedOp()
+
+    /**
+     * Change the value: get the current and set to the returned, all in the
+     * atomic operation. All other mutating requests including assigning to [value]
+     * will be blocked and queued.
+     * @return result of the mutation. Note that immediate call to property [value]
+     *      could already return modified bu some other thread value!
+     */
+    fun mutate(mutator: (T) -> T): T = op {
+        actualValue = mutator(actualValue)
+        actualValue
+    }
+
+    /**
+     * Atomic get or set the value. Atomic get means if there is a [mutate] in progress
+     * it will wait until the mutation finishes and then return the correct result.
+     */
+    var value: T
+        get() = op { actualValue }
+        set(value) {
+            mutate { value }
+        }
+}
\ No newline at end of file
diff --git a/src/commonTest/kotlin/KeysTest.kt b/src/commonTest/kotlin/KeysTest.kt
index e2ebcae..fd90354 100644
--- a/src/commonTest/kotlin/KeysTest.kt
+++ b/src/commonTest/kotlin/KeysTest.kt
@@ -11,7 +11,7 @@ class KeysTest {
     @Test
     fun testCreationAndMap() = runTest {
         initCrypto()
-        val (stk,pbk) = SigningKey.Secret.pair()
+        val (stk,pbk) = SigningKey.pair()
 
         val x = mapOf( stk to "STK!", pbk to "PBK!")
         assertEquals("STK!", x[stk])
@@ -27,17 +27,17 @@ class KeysTest {
 
         data1[0] = 0x01u
         assertFalse(s.verify(data1))
-        val p2 = SigningKey.Secret.pair()
-        val p3 = SigningKey.Secret.pair()
+        val p2 = SigningKey.pair()
+        val p3 = SigningKey.pair()
 
-        val ms = SignedBox(data, s1) + p2.signing
+        val ms = SignedBox(data, s1) + p2.secretKey
 
         // non tampered:
         val ms1 = unpack<SignedBox>(pack(ms))
         assertContentEquals(data, ms1.message)
         assertTrue(pbk in ms1)
-        assertTrue(p2.aPublic in ms1)
-        assertTrue(p3.aPublic !in ms1)
+        assertTrue(p2.publicKey in ms1)
+        assertTrue(p3.publicKey !in ms1)
 
         assertThrows<IllegalSignatureException> {
             unpack<SignedBox>(pack(ms).also { it[3] = 1u })