Payload interface moved into model package

Author: arietrouw

…ient/boundwitness/XyoBoundWitnessTest.kt …/client/boundwitness/BoundWitnessTest.ktsdk/src/androidTest/java/network/xyo/client/boundwitness/XyoBoundWitnessTest.kt renamed to sdk/src/androidTest/java/network/xyo/client/boundwitness/BoundWitnessTest.kt sdk/src/androidTest/java/network/xyo/client/boundwitness/XyoBoundWitnessTest.kt renamed to sdk/src/androidTest/java/network/xyo/client/boundwitness/BoundWitnessTest.kt

@@ -12,16 +12,16 @@ import network.xyo.client.node.client.DiscoverPayload
 import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository
 import network.xyo.client.lib.JsonSerializable
 import network.xyo.client.node.client.NodeClient
-import network.xyo.client.payload.XyoPayload
+import network.xyo.client.payload.Payload
 import org.json.JSONObject
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.jupiter.api.Assertions.*
 
-data class RequestDependencies(val client: NodeClient, val query: XyoPayload, val payloads: List<XyoPayload>)
+data class RequestDependencies(val client: NodeClient, val query: Payload, val payloads: List<Payload>)
 
-class XyoBoundWitnessTest {
+class BoundWitnessTest {
 
     val apiDomainBeta = "https://beta.api.archivist.xyo.network"
     val apiDomainLocal = "http://10.0.2.2:8080"
@@ -47,7 +47,7 @@ class XyoBoundWitnessTest {
         val account = Account.random()
         val client = NodeClient(nodeUrl, account, appContext)
         val query = DiscoverPayload()
-        val payloads = mutableListOf<XyoPayload>()
+        val payloads = mutableListOf<Payload>()
         payloads.add(TestPayload1())
         return RequestDependencies(client, query, payloads)
     }

sdk/src/androidTest/java/network/xyo/client/boundwitness/TestBoundWitnessSequence.kt

@@ -1,8 +1,7 @@
 import network.xyo.client.payload.Payload
 
-class IdPayload(val salt: String): Payload {
+class IdPayload(val salt: String): Payload("network.xyo.id") {
     constructor(salt: UInt) : this("${salt}")
-    override var schema = "network.xyo.id"
 }
 
 data class BoundWitnessSequenceTestCase(

sdk/src/androidTest/java/network/xyo/client/boundwitness/TestPayload1.kt

@@ -5,8 +5,7 @@ class TestPayload1SubObject {
     var string_value = "yo"
 }
 
-class TestPayload1: Payload {
-    override var schema ="network.xyo.test"
+class TestPayload1: Payload("network.xyo.test") {
     var timestamp = 1_618_603_439_107
     var number_field = 1
     var object_field = TestPayload1SubObject()

sdk/src/androidTest/java/network/xyo/client/boundwitness/TestPayload2.kt

@@ -6,8 +6,7 @@ class TestPayload2SubObject {
     var optional_field: String? = null
 }
 
-class TestPayload2: Payload {
-    override var schema ="network.xyo.test"
+class TestPayload2: Payload("network.xyo.test") {
     var timestamp = 1_618_603_439_107
     var object_field = TestPayload2SubObject()
     var string_field = "there"

sdk/src/androidTest/java/network/xyo/client/lib/Constants.kt

@@ -1,18 +1,18 @@
 package network.xyo.client.lib
 
 import network.xyo.client.account.Account
-import network.xyo.client.payload.XyoPayload
+import network.xyo.client.payload.Payload
 
-class DebugPayload(val nonce: Int) : XyoPayload() {
-    override var schema: String
-        get() = "network.xyo.debug"
-        set(value) = Unit
+class DebugPayload(val nonce: Int) : Payload(SCHEMA) {
+    companion object {
+        const val SCHEMA = "network.xyo.debug"
+    }
 }
 
-class BasicPayload : XyoPayload() {
-    override var schema: String
-        get() = "network.xyo.basic"
-        set(value) = Unit
+class BasicPayload : Payload(SCHEMA) {
+    companion object {
+        const val SCHEMA = "network.xyo.basic"
+    }
 }
 
 

sdk/src/androidTest/java/network/xyo/client/node/client/NodeClientTest.kt

@@ -7,14 +7,16 @@ import kotlinx.coroutines.runBlocking
 import network.xyo.client.lib.TestConstants
 import network.xyo.client.account.Account
 import network.xyo.client.archivist.wrapper.ArchivistWrapper
-import network.xyo.client.boundwitness.XyoBoundWitnessBodyJson
-import network.xyo.client.payload.XyoPayload
+import network.xyo.client.boundwitness.BoundWitnessBodyJson
+import network.xyo.client.payload.Payload
 import org.junit.Before
 import org.junit.Test
 import org.junit.jupiter.api.Assertions.*
 
-class DiscoverPayload : XyoPayload() {
-    override var schema = "network.xyo.query.module.discover"
+class DiscoverPayload : Payload(SCHEMA) {
+    companion object {
+        const val SCHEMA = "network.xyo.query.module.discover"
+    }
 }
 
 class NodeClientTest {
@@ -69,7 +71,7 @@ class NodeClientTest {
             assertEquals(errors, null)
 
             if (response != null) {
-                assertEquals(response.bw?.schema, XyoBoundWitnessBodyJson.schema)
+                assertEquals(response.bw?.schema, BoundWitnessBodyJson.SCHEMA)
             } else {
                 throw(Error("Response should not be null"))
             }

sdk/src/androidTest/java/network/xyo/client/payload/EventPayload.kt

@@ -0,0 +1,13 @@
+package network.xyo.client.payload
+
+import com.squareup.moshi.JsonClass
+import java.util.*
+
+@JsonClass(generateAdapter = true)
+open class EventPayload(val event: String): Payload(SCHEMA) {
+    val timestamp = Date().time
+
+    companion object {
+        const val SCHEMA = "network.xyo.event"
+    }
+}

…ork/xyo/client/payload/XyoPayloadTest.kt …etwork/xyo/client/payload/PayloadTest.ktsdk/src/androidTest/java/network/xyo/client/payload/XyoPayloadTest.kt renamed to sdk/src/androidTest/java/network/xyo/client/payload/PayloadTest.kt sdk/src/androidTest/java/network/xyo/client/payload/XyoPayloadTest.kt renamed to sdk/src/androidTest/java/network/xyo/client/payload/PayloadTest.kt

@@ -17,8 +17,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.jupiter.api.Assertions.*
 
-open class TestSubjectPayload: XyoPayload() {
-    override var schema = "network.xyo.test"
+open class TestSubjectPayload: Payload("network.xyo.test") {
+
 }
 
 class TestPayload1SubObject {
@@ -55,7 +55,7 @@ class TestInvalidSchemaPayload: TestSubjectPayload() {
 val knownAddress = Account.fromPrivateKey(ByteArray(32) {index -> index.toByte()})
 const val knownHash = "6e173bbfc0577ebde66b44b090316eca5ecad8ecdb5c51886211d805c769d2ea"
 
-class XyoPayloadTest {
+class PayloadTest {
 
     @Rule
     @JvmField
@@ -96,7 +96,7 @@ class XyoPayloadTest {
     @Test
     fun testRoundTripPanel() {
         val address = Account.fromPrivateKey("5a95531488b4d0d3645aea49678297ae9e2034879ce0389b80eb788e8b533592")
-        val witness = XyoWitness(address, fun(_: Context): List<XyoPayload> {
+        val witness = XyoWitness(address, fun(_: Context): List<Payload> {
             return listOf(BasicPayload())
         })
 

sdk/src/androidTest/java/network/xyo/client/payload/XyoEventPayload.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.payload.XyoEventPayload
+import network.xyo.client.payload.EventPayload
 import network.xyo.client.witness.XyoPanel
 import network.xyo.client.account.model.AccountInstance
 import org.junit.Before
@@ -69,8 +69,8 @@ class XyoSdkTest {
             val instance = XyoSdk.getInstance(appContext)
 
             val testAccount = instance.getAccount(appContext)
-            val panel = XyoPanel(appContext, testAccount, fun(_:Context): List<XyoEventPayload> {
-                return listOf(XyoEventPayload("test_event"))
+            val panel = XyoPanel(appContext, testAccount, fun(_:Context): List<EventPayload> {
+                return listOf(EventPayload("test_event"))
             })
             val result = panel.reportAsyncQuery()
             val bw = result.bw