move dataHash to hash

XYOracleNetwork · Nov 25, 2024 · b86a645 · b86a645
1 parent 73765d8
commit b86a645
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/sdk/src/androidTest/java/network/xyo/client/boundwitness/XyoBoundWitnessTest.kt b/sdk/src/androidTest/java/network/xyo/client/boundwitness/XyoBoundWitnessTest.kt
@@ -77,17 +77,23 @@ class XyoBoundWitnessTest {
             val bw = XyoBoundWitnessBuilder(appContext).signer(Account.random()).payloads(listOf(
                 TestPayload1()
             )).build()
-            assert(bw.meta.hash !== null)
-            assert(bw.meta.hash!! == bw.dataHash())
-            assert(bw.meta.hash!! != bw.rootHash())
+            assert(bw.rootHash() == XyoSerializable.sha256String(bw))
+            assert(bw.hash() == bw.getBodyJson().hash())
             assert(bw.meta.client == "android")
             assert(bw.meta.signatures?.size == 1)
+        }
+    }
 
+    @Test
+    fun testBoundWitnessMetaSerialization() {
+        runBlocking {
+            val bw = XyoBoundWitnessBuilder(appContext).signer(Account.random()).payloads(listOf(
+                TestPayload1()
+            )).build()
             val serializedBw = XyoSerializable.toJson(bw)
             val bwJson = JSONObject(serializedBw)
             val meta = bwJson.get("\$meta") as JSONObject
             assert(meta.get("client") == "android")
-            assertNotNull(meta.get("hash"))
             assertNotNull(meta.get("signatures"))
         }
     }
@@ -102,7 +108,7 @@ class XyoBoundWitnessTest {
             val bw2 = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(
                 TestPayload1()
             )).build()
-            assert(bw2.previous_hashes.first() == bw.meta.hash)
+            assert(bw2.previous_hashes.first() == bw.hash())
         }
     }
 }
diff --git a/sdk/src/androidTest/java/network/xyo/client/settings/XyoSdkTest.kt b/sdk/src/androidTest/java/network/xyo/client/settings/XyoSdkTest.kt
@@ -76,7 +76,7 @@ class XyoSdkTest {
             val bw = result.bw
 
             val result2 = panel.reportAsyncQuery()
-            assert(result2.bw.previous_hashes.contains(bw.meta.hash))
+            assert(result2.bw.previous_hashes.contains(bw.hash()))
         }
     }
 }
diff --git a/sdk/src/androidTest/java/network/xyo/client/witness/WitnessLocationHandlerTest.kt b/sdk/src/androidTest/java/network/xyo/client/witness/WitnessLocationHandlerTest.kt
@@ -78,7 +78,7 @@ class WitnessLocationHandlerTest {
                 }
             }
 
-            val firstBwHash = firstBw!!.dataHash()
+            val firstBwHash = firstBw!!.hash()
             assert(secondBw!!.previous_hashes.size == 1)
             assert(secondBw.previous_hashes.first() == firstBwHash)
         }

diff --git a/sdk/src/androidTest/java/network/xyo/client/witness/XyoPanelTest.kt b/sdk/src/androidTest/java/network/xyo/client/witness/XyoPanelTest.kt
@@ -113,7 +113,7 @@ class XyoPanelTest {
             val bw = result.bw
 
             val result2 = panel.reportAsyncQuery()
-            assert(result2.bw.previous_hashes.contains(bw.meta.hash))
+            assert(result2.bw.previous_hashes.contains(bw.hash()))
         }
     }
 

diff --git a/sdk/src/main/java/network/xyo/client/boundwitness/XyoBoundWitnessBuilder.kt b/sdk/src/main/java/network/xyo/client/boundwitness/XyoBoundWitnessBuilder.kt
@@ -93,7 +93,6 @@ open class XyoBoundWitnessBuilder(private val context: Context) {
         val hashable = hashableFields()
         val hash = XyoSerializable.sha256String(hashable)
         bw.meta.signatures = this.sign(hash)
-        bw.meta.hash = hash
     }
 
     open suspend fun build(): XyoBoundWitnessJson {

diff --git a/sdk/src/main/java/network/xyo/client/boundwitness/XyoBoundWitnessJson.kt b/sdk/src/main/java/network/xyo/client/boundwitness/XyoBoundWitnessJson.kt
@@ -7,7 +7,6 @@ import com.squareup.moshi.JsonClass
 class XyoBoundWitnessMeta: XyoBoundWitnessMetaInterface {
     override var signatures: List<String>? = null
     override var client: String? = null
-    override var hash: String? = null
 }
 
 @JsonClass(generateAdapter = true)
@@ -19,12 +18,12 @@ open class XyoBoundWitnessJson: XyoBoundWitnessBodyJson() {
         get() = _meta
         set(value) = Unit
 
-    fun rootHash(): String {
-        return sha256String(this)
+    override fun hash(): String {
+        return getBodyJson().hash()
     }
 
-    fun dataHash(): String {
-        return sha256String(getBodyJson())
+    fun rootHash(): String {
+        return sha256String(this)
     }
 
     open fun getBodyJson(): XyoBoundWitnessBodyJson {

diff --git a/sdk/src/main/java/network/xyo/client/boundwitness/XyoBoundWitnessMetaInterface.kt b/sdk/src/main/java/network/xyo/client/boundwitness/XyoBoundWitnessMetaInterface.kt
@@ -1,7 +1,6 @@
 package network.xyo.client.boundwitness
 
 interface XyoBoundWitnessMetaInterface {
-    var hash: String?
     var signatures: List<String>?
     var client: String?
 }