Using new Account object

Everywhere except in the XyoAccountTest
XYOracleNetwork · Nov 15, 2024 · e5ac5d3 · e5ac5d3
1 parent bbfc613
commit e5ac5d3
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 21 deletions.
diff --git a/...o/client/XyoAccountPrefsRepositoryTest.kt → .../xyo/client/AccountPrefsRepositoryTest.kt b/...o/client/XyoAccountPrefsRepositoryTest.kt → .../xyo/client/AccountPrefsRepositoryTest.kt
@@ -3,7 +3,7 @@ package network.xyo.client
 import android.content.Context
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.address.XyoAccount
+import network.xyo.client.account.Account
 import network.xyo.client.boundwitness.XyoBoundWitnessBuilder
 import network.xyo.client.datastore.AccountPrefsRepository
 import network.xyo.client.settings.AccountPreferences
@@ -13,7 +13,7 @@ import org.junit.Test
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotEquals
 
-class XyoAccountPrefsRepositoryTest {
+class AccountPrefsRepositoryTest {
 
     private lateinit var appContext: Context
 
@@ -105,7 +105,7 @@ class XyoAccountPrefsRepositoryTest {
     @Test
     fun testAccountDeserialization() {
         runBlocking {
-            val testAccount = XyoAccount()
+            val testAccount = Account.random()
             val instance = AccountPrefsRepository.getInstance(appContext)
             // Clear previously saved accounts
             instance.clearSavedAccountKey()
@@ -114,7 +114,7 @@ class XyoAccountPrefsRepositoryTest {
 
             // Deserialize the test account
             val firstAccount = instance.getAccount()
-            assertEquals(firstAccount.privateKey.toHexString(), testAccount.private.hex)
+            assertEquals(firstAccount.privateKey.toHexString(), testAccount.privateKey.toHexString())
 
             // Sign with the test account
             val firstBw = XyoBoundWitnessBuilder().witness(firstAccount, null).payloads(listOf(TestConstants.debugPayload)).build()

diff --git a/sdk/src/androidTest/java/network/xyo/client/Constants.kt b/sdk/src/androidTest/java/network/xyo/client/Constants.kt
@@ -1,6 +1,6 @@
 package network.xyo.client
 
-import network.xyo.client.address.XyoAccount
+import network.xyo.client.account.Account
 import network.xyo.client.payload.XyoPayload
 
 class DebugPayload(val nonce: Int) : XyoPayload() {
@@ -19,7 +19,7 @@ class BasicPayload(): XyoPayload() {
 class TestConstants {
     companion object {
         const val accountPrivateKey = "69f0b123c094c34191f22c25426036d6e46d5e1fab0a04a164b3c1c2621152ab"
-        val TestAccount = XyoAccount(XyoSerializable.hexToBytes(accountPrivateKey))
+        val TestAccount = Account.fromPrivateKey(accountPrivateKey)
         val debugPayload = DebugPayload(1)
         const val debugPayloadHash = "15b8d0e30ca5aa96ca6cc9e1528c075aec88cd3f2c3eb0394fde647eb4bf4547"
         const val nodeUrlLocal = "http://10.0.2.2:8080"

diff --git a/sdk/src/androidTest/java/network/xyo/client/NodeClientTest.kt b/sdk/src/androidTest/java/network/xyo/client/NodeClientTest.kt
@@ -2,7 +2,7 @@ package network.xyo.client
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.address.XyoAccount
+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
@@ -19,7 +19,7 @@ class NodeClientTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun discoverTestBeta() {
-        val account = XyoAccount()
+        val account = Account.random()
         val client = NodeClient(TestConstants.nodeUrlBeta, account)
         val query = DiscoverPayload()
 
@@ -33,7 +33,7 @@ class NodeClientTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun discoverTestLocal() {
-        val account = XyoAccount()
+        val account = Account.random()
         val client = NodeClient(TestConstants.nodeUrlBeta, account)
         val query = XyoPayload("network.xyo.query.module.discover")
 

diff --git a/sdk/src/androidTest/java/network/xyo/client/XyoBoundWitnessTest.kt b/sdk/src/androidTest/java/network/xyo/client/XyoBoundWitnessTest.kt
@@ -5,7 +5,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.address.XyoAccount
+import network.xyo.client.account.Account
 import network.xyo.client.node.client.NodeClient
 import network.xyo.client.payload.XyoPayload
 import org.junit.Before
@@ -34,7 +34,7 @@ class XyoBoundWitnessTest {
     }
 
     fun generateQuery(nodeUrl: String): RequestDependencies {
-        val account = XyoAccount()
+        val account = Account.random()
         val client = NodeClient(nodeUrl, account)
         val query = DiscoverPayload()
         val payloads = mutableListOf<XyoPayload>()

diff --git a/sdk/src/androidTest/java/network/xyo/client/XyoPanelTest.kt b/sdk/src/androidTest/java/network/xyo/client/XyoPanelTest.kt
@@ -7,7 +7,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
-import network.xyo.client.address.XyoAccount
+import network.xyo.client.account.Account
 import network.xyo.client.boundwitness.XyoBoundWitnessJson
 import network.xyo.client.payload.XyoPayload
 import network.xyo.client.witness.location.info.LocationActivity
@@ -45,8 +45,8 @@ class XyoPanelTest {
     }
 
     private fun testCreatePanel(nodeUrl: String) {
-        val witness = XyoWitness<XyoPayload>(XyoAccount())
-        val panel = XyoPanel(appContext, arrayListOf(Pair(nodeUrl, XyoAccount())), listOf(witness))
+        val witness = XyoWitness<XyoPayload>(Account.random())
+        val panel = XyoPanel(appContext, arrayListOf(Pair(nodeUrl, Account.random())), listOf(witness))
         assertNotNull(panel)
     }
 
@@ -63,12 +63,12 @@ class XyoPanelTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     fun testPanelReport(nodeUrl: String) {
         runBlocking {
-            val witnessAccount = XyoAccount(XyoSerializable.hexToBytes("9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"))
-            val witness2Account = XyoAccount(XyoSerializable.hexToBytes("5a95531488b4d0d3645aea49678297ae9e2034879ce0389b80eb788e8b533592"))
+            val witnessAccount = Account.fromPrivateKey("9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08")
+            val witness2Account = Account.fromPrivateKey("5a95531488b4d0d3645aea49678297ae9e2034879ce0389b80eb788e8b533592")
             val witness = XyoWitness(witnessAccount, fun(_: Context, _: String?): XyoPayload {
                 return BasicPayload()
             })
-            val panel = XyoPanel(appContext, arrayListOf(Pair(nodeUrl, XyoAccount())), listOf(witness, XyoSystemInfoWitness(witness2Account), XyoLocationWitness()))
+            val panel = XyoPanel(appContext, arrayListOf(Pair(nodeUrl, Account.random())), listOf(witness, XyoSystemInfoWitness(witness2Account), XyoLocationWitness()))
             val result = panel.reportAsyncQuery()
             if (result.apiResults === null) throw NullPointerException("apiResults should not be null")
             result.apiResults?.forEach {
@@ -106,7 +106,7 @@ class XyoPanelTest {
     @Test
     fun testReportEvent() {
         runBlocking {
-            val panel = XyoPanel(appContext, arrayListOf(Pair(apiDomainBeta, XyoAccount())), listOf(XyoSystemInfoWitness()))
+            val panel = XyoPanel(appContext, arrayListOf(Pair(apiDomainBeta, Account.random())), listOf(XyoSystemInfoWitness()))
             val result = panel.reportAsyncQuery()
             if (result.apiResults === null) throw Error()
             result.apiResults?.forEach { assertEquals(it.errors, null) }

diff --git a/sdk/src/androidTest/java/network/xyo/client/XyoPayloadTest.kt b/sdk/src/androidTest/java/network/xyo/client/XyoPayloadTest.kt
@@ -6,7 +6,7 @@ import androidx.test.rule.GrantPermissionRule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import network.xyo.client.address.XyoAccount
+import network.xyo.client.account.Account
 import network.xyo.client.boundwitness.XyoBoundWitnessBuilder
 import network.xyo.client.payload.XyoPayload
 import org.junit.Before
@@ -49,7 +49,7 @@ class TestInvalidSchemaPayload: TestSubjectPayload() {
     var string_field = "there"
 }
 
-val knownAddress = XyoAccount(ByteArray(32) {index -> index.toByte()})
+val knownAddress = Account.fromPrivateKey(ByteArray(32) {index -> index.toByte()})
 const val knownHash = "6e173bbfc0577ebde66b44b090316eca5ecad8ecdb5c51886211d805c769d2ea"
 
 class XyoPayloadTest {
@@ -92,7 +92,7 @@ class XyoPayloadTest {
 
     @Test
     fun testRoundTripPanel() {
-        val address = XyoAccount(XyoSerializable.hexToBytes("5a95531488b4d0d3645aea49678297ae9e2034879ce0389b80eb788e8b533592"))
+        val address = Account.fromPrivateKey("5a95531488b4d0d3645aea49678297ae9e2034879ce0389b80eb788e8b533592")
         val witness = XyoWitness(address, fun(_: Context, _: String?): XyoPayload {
             return BasicPayload()
         })

diff --git a/sdk/src/main/java/network/xyo/client/account/Account.kt b/sdk/src/main/java/network/xyo/client/account/Account.kt
@@ -52,6 +52,10 @@ open class Account private constructor (private val _privateKey: PrivateKey, pri
             return Account(key)
         }
 
+        override fun fromPrivateKey(key: String): AccountInstance {
+            return fromPrivateKey(hexStringToByteArray(key))
+        }
+
         override fun random(): AccountInstance {
             return fromPrivateKey(generatePrivateKeyBytes())
         }

diff --git a/sdk/src/main/java/network/xyo/client/account/model/AccountStatic.kt b/sdk/src/main/java/network/xyo/client/account/model/AccountStatic.kt
@@ -3,5 +3,6 @@ package network.xyo.client.account.model
 interface AccountStatic<T: AccountInstance> {
     var previousHashStore: PreviousHashStore?
     fun fromPrivateKey(key: ByteArray): T
+    fun fromPrivateKey(key: String): T
     fun random(): T
 }