remove depracations and reorganize

sdk/src/androidTest/java/network/xyo/client/XyoBoundWitnessTest.kt → sdk/src/androidTest/java/network/xyo/client/boundwitness/XyoBoundWitnessTest.kt

@@ -1,13 +1,15 @@
-package network.xyo.client
+package network.xyo.client.boundwitness
 
 import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
+import network.xyo.client.payload.TestPayload1
 import network.xyo.client.account.Account
-import network.xyo.client.boundwitness.XyoBoundWitnessBuilder
+import network.xyo.client.node.client.DiscoverPayload
 import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository
+import network.xyo.client.lib.XyoSerializable
 import network.xyo.client.node.client.NodeClient
 import network.xyo.client.payload.XyoPayload
 import org.junit.Before
@@ -71,7 +73,9 @@ class XyoBoundWitnessTest {
     @Test
     fun testBoundWitnessHash() {
         runBlocking {
-            val bw = XyoBoundWitnessBuilder(appContext).signer(Account.random()).payloads(listOf(TestPayload1())).build()
+            val bw = XyoBoundWitnessBuilder(appContext).signer(Account.random()).payloads(listOf(
+                TestPayload1()
+            )).build()
             val hashableFields = bw.getBodyJson()
             assert(bw._hash !== null)
             assert(bw._hash!! == XyoSerializable.sha256String(hashableFields))
@@ -83,8 +87,12 @@ class XyoBoundWitnessTest {
     fun testBoundWitnessPreviousHash() {
         runBlocking {
             val testAccount = Account.random()
-            val bw = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(TestPayload1())).build()
-            val bw2 = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(TestPayload1())).build()
+            val bw = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(
+                TestPayload1()
+            )).build()
+            val bw2 = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(
+                TestPayload1()
+            )).build()
             assert(bw2.previous_hashes.first() == bw._hash)
         }
     }

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

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.lib
 
 import network.xyo.client.account.Account
 import network.xyo.client.payload.XyoPayload
@@ -26,6 +26,5 @@ class TestConstants {
         const val nodeUrlBeta = "https://beta.api.archivist.xyo.network"
         const val queryResponseJson = "{\"data\":[{\"addresses\":[\"cddaa9e8922142dfd53e5067f5b9e5de5c2ea0cf\",\"6cfeb02624f01112892e02f18a5e3409ae0a0739\"],\"payload_hashes\":[\"09a4dda042973bcb69f7a7f63a8a79763760e0e2ca9b0d486d7edf72ac2288be\"],\"payload_schemas\":[\"network.xyo.boundwitness\"],\"previous_hashes\":[\"09a4dda042973bcb69f7a7f63a8a79763760e0e2ca9b0d486d7edf72ac2288be\",null],\"schema\":\"network.xyo.boundwitness\",\"timestamp\":1682101895916,\"_signatures\":[\"5c94a98e2da7a4d3750c54c6a3a539900d7722c49419555f0563227876fc7eb3c67718b20bce7ba84913754557eea1a7864a1bc60aa5de5184f1e711a5b54637\",\"02910768ebb01049ccc10e957cbc70c32b71d1891bee66dcb71bedee284f796ca82c791e0efd361d49b34c10afce2aecacf9f27655c3496c91a83f5ad6ed8398\"]},[{\"addresses\":[\"cddaa9e8922142dfd53e5067f5b9e5de5c2ea0cf\"],\"payload_hashes\":[\"a83df3b9d9e92a391d6e172817762a90f1f6ca19da226e7a4679284d6af91f9b\",\"89dafadc4fa4249d73fce1bae21fe14ecff36175564fcbb8dc343982402f4d7e\",\"3cef5677c2f800d6603cebebab17e1cb459e086b81a50fd8d154a5dd5f279d2d\"],\"payload_schemas\":[\"network.xyo.boundwitness\",\"network.xyo.system.info\",\"network.xyo.query.archivist.insert\"],\"previous_hashes\":[null],\"schema\":\"network.xyo.boundwitness\",\"timestamp\":1682101895915,\"_signatures\":[\"5cd4359570fd0273f79a9181c3345aa034481e62c01e6f29e29861eeb167fbf0c2451fc9096c2c9d99b2a5e1ad3e53318fb6a47647fb083842cc82ead6d7c58c\"]}]],\"meta\":{\"profile\":{\"duration\":37,\"endTime\":1682101895919,\"startTime\":1682101895882}}}"
         const val queryResponseBWHash = "eb5bcbf881e5f91f8b10bb360bcb660b6e70b9ed429ac3c5c0f9b74150b59a07"
-        const val panelBwHash = "09a4dda042973bcb69f7a7f63a8a79763760e0e2ca9b0d486d7edf72ac2288be"
     }
 }

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

@@ -1,12 +1,12 @@
-package network.xyo.client
+package network.xyo.client.node.client
 
 import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 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.node.client.NodeClient
 import network.xyo.client.payload.XyoPayload
 import org.junit.Before
 import org.junit.Test
@@ -57,7 +57,8 @@ class NodeClientTest {
 
     @Test
     fun archivistInsertTest() {
-        val archivist = ArchivistWrapper(NodeClient(apiDomainBeta, TestConstants.TestAccount, appContext))
+        val archivist = ArchivistWrapper(NodeClient(apiDomainBeta,
+            TestConstants.TestAccount, appContext))
 
         val payloads = arrayListOf(TestConstants.debugPayload)
 

sdk/src/androidTest/java/network/xyo/client/QueryResponseWrapperTest.kt → sdk/src/androidTest/java/network/xyo/client/node/client/QueryResponseWrapperTest.kt

@@ -1,6 +1,6 @@
-package network.xyo.client
+package network.xyo.client.node.client
 
-import network.xyo.client.node.client.QueryResponseWrapper
+import network.xyo.client.lib.TestConstants
 import org.junit.Test
 import org.junit.jupiter.api.Assertions.*
 

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

@@ -1,7 +1,6 @@
-package network.xyo.client
+package network.xyo.client.payload
 
 import com.squareup.moshi.JsonClass
-import network.xyo.client.payload.XyoPayload
 import java.util.*
 
 @JsonClass(generateAdapter = true)

sdk/src/androidTest/java/network/xyo/client/XyoPayloadTest.kt → sdk/src/androidTest/java/network/xyo/client/payload/XyoPayloadTest.kt

@@ -1,14 +1,17 @@
-package network.xyo.client
+package network.xyo.client.payload
 
 import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import network.xyo.client.lib.BasicPayload
+import network.xyo.client.lib.TestConstants
 import network.xyo.client.account.Account
 import network.xyo.client.boundwitness.XyoBoundWitnessBuilder
-import network.xyo.client.payload.XyoPayload
+import network.xyo.client.lib.XyoSerializable
+import network.xyo.client.witness.XyoWitness
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test

sdk/src/androidTest/java/network/xyo/client/prefs/AccountPrefsRepositoryTest.kt

@@ -3,8 +3,8 @@ package network.xyo.client.prefs
 import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.TestConstants
-import network.xyo.client.XyoPanel
+import network.xyo.client.lib.TestConstants
+import network.xyo.client.witness.XyoPanel
 import network.xyo.client.account.Account
 import network.xyo.client.boundwitness.XyoBoundWitnessBuilder
 import network.xyo.client.datastore.accounts.AccountPrefsRepository

sdk/src/androidTest/java/network/xyo/client/prefs/PreviousHashStorePrefsRepositoryTest.kt

@@ -3,7 +3,7 @@ package network.xyo.client.prefs
 import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.TestConstants
+import network.xyo.client.lib.TestConstants
 import network.xyo.client.account.Account
 import network.xyo.client.account.hexStringToByteArray
 import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository

sdk/src/androidTest/java/network/xyo/client/settings/XyoSdkTest.kt

@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.XyoEventPayload
-import network.xyo.client.XyoPanel
+import network.xyo.client.payload.XyoEventPayload
+import network.xyo.client.witness.XyoPanel
 import network.xyo.client.account.model.AccountInstance
 import org.junit.Before
 import org.junit.Test

sdk/src/androidTest/java/network/xyo/client/witness/WitnessLocationHandlerTest.kt

@@ -7,7 +7,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.TestConstants
+import network.xyo.client.lib.TestConstants
 import network.xyo.client.account.Account
 import network.xyo.client.boundwitness.XyoBoundWitnessBodyJson
 import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository

sdk/src/androidTest/java/network/xyo/client/XyoPanelTest.kt → sdk/src/androidTest/java/network/xyo/client/witness/XyoPanelTest.kt

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.witness
 
 import android.Manifest
 import android.content.Context
@@ -7,6 +7,9 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
+import network.xyo.client.lib.BasicPayload
+import network.xyo.client.lib.TestConstants
+import network.xyo.client.payload.XyoEventPayload
 import network.xyo.client.account.Account
 import network.xyo.client.boundwitness.XyoBoundWitnessJson
 import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository

sdk/src/main/java/network/xyo/client/boundwitness/QueryBoundWitnessBuilder.kt

@@ -3,7 +3,7 @@ package network.xyo.client.boundwitness
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
-import network.xyo.client.XyoSerializable
+import network.xyo.client.lib.XyoSerializable
 import network.xyo.client.account.model.AccountInstance
 import network.xyo.client.payload.XyoPayload
 

sdk/src/main/java/network/xyo/client/boundwitness/XyoBoundWitnessBodyJson.kt

@@ -1,7 +1,6 @@
 package network.xyo.client.boundwitness
 
 import com.squareup.moshi.JsonClass
-import network.xyo.client.XyoSerializable
 import network.xyo.client.payload.XyoPayload
 
 @JsonClass(generateAdapter = true)

sdk/src/main/java/network/xyo/client/boundwitness/XyoBoundWitnessBuilder.kt

@@ -3,7 +3,7 @@ package network.xyo.client.boundwitness
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
-import network.xyo.client.XyoSerializable
+import network.xyo.client.lib.XyoSerializable
 import network.xyo.client.account.hexStringToByteArray
 import network.xyo.client.account.model.AccountInstance
 import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository

sdk/src/main/java/network/xyo/client/datastore/accounts/AccountPrefsRepository.kt

@@ -13,7 +13,7 @@ import network.xyo.client.account.model.AccountInstance
 import network.xyo.client.settings.AccountPreferences
 import network.xyo.client.settings.SettingsInterface
 import network.xyo.client.settings.defaultXyoSdkSettings
-import network.xyo.client.xyoScope
+import network.xyo.client.lib.xyoScope
 
 
 class AccountPrefsRepository(context: Context, settings: SettingsInterface = defaultXyoSdkSettings) {

sdk/src/main/java/network/xyo/client/datastore/previous_hash_store/PreviousHashStorePrefsRepository.kt

@@ -9,7 +9,7 @@ import network.xyo.client.account.model.PreviousHashStore
 import network.xyo.client.settings.PreviousHashStorePreferences
 import network.xyo.client.settings.SettingsInterface
 import network.xyo.client.settings.defaultXyoSdkSettings
-import network.xyo.client.xyoScope
+import network.xyo.client.lib.xyoScope
 import network.xyo.data.PreviousHashPrefsDataStoreProtos.PreviousHashPrefsDataStore
 
 

sdk/src/main/java/network/xyo/client/EcConstants.kt → sdk/src/main/java/network/xyo/client/ec/EcConstants.kt

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.ec
 
 import java.math.BigInteger
 

sdk/src/main/java/network/xyo/client/EcCurve.kt → sdk/src/main/java/network/xyo/client/ec/EcCurve.kt

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.ec
 
 import java.math.BigInteger
 import java.security.spec.ECFieldFp

sdk/src/main/java/network/xyo/client/EcPoint.kt → sdk/src/main/java/network/xyo/client/ec/EcPoint.kt

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.ec
 
 import java.math.BigInteger
 import java.security.spec.ECPoint

sdk/src/main/java/network/xyo/client/EcPointMath.kt → sdk/src/main/java/network/xyo/client/ec/EcPointMath.kt

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.ec
 
 import java.math.BigInteger
 
@@ -39,7 +39,7 @@ object EcPointMath {
      * @return The slope of the tangent line at the point
      */
     fun tangent (point: EcPoint, curve: EcCurve) : BigInteger {
-        return divide(point.affineX * point.affineX*EcConstants.THREE+curve.a, point.affineY * EcConstants.TWO, curve.p)
+        return divide(point.affineX * point.affineX* EcConstants.THREE +curve.a, point.affineY * EcConstants.TWO, curve.p)
     }
 
     /**

sdk/src/main/java/network/xyo/client/XyoClientCoroutineScope.kt → sdk/src/main/java/network/xyo/client/lib/XyoClientCoroutineScope.kt

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.lib
 
 import kotlinx.coroutines.*
 import kotlin.coroutines.CoroutineContext

sdk/src/main/java/network/xyo/client/XyoSerializable.kt → sdk/src/main/java/network/xyo/client/lib/XyoSerializable.kt

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.lib
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
@@ -69,7 +69,7 @@ abstract class XyoSerializable: Serializable  {
                 .addLast(KotlinJsonAdapterFactory())
                 .build()
             val adapter = moshi.adapter(obj.first().javaClass)
-            val items = obj.map {item -> sortJson(adapter.toJson(item), removeMeta)}
+            val items = obj.map {item -> sortJson(adapter.toJson(item), removeMeta) }
             return items.joinToString(",", "[", "]")
         }
 

sdk/src/main/java/network/xyo/client/hasPermission.kt → sdk/src/main/java/network/xyo/client/lib/hasPermission.kt

@@ -1,4 +1,4 @@
-package network.xyo.client
+package network.xyo.client.lib
 
 import android.content.Context
 import android.content.pm.PackageManager