Skip to content

Commit 843702f

Browse files
jonesmacjonesmac
authored
Merge pull request #24 from XYOracleNetwork/feature/remove-depracations
remove depracations and reorganize
2 parents 1a2edd8 + 851dcc2 commit 843702f

36 files changed

+62
-249
lines changed

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
package network.xyo.client
1+
package network.xyo.client.boundwitness
22

33
import android.content.Context
44
import androidx.test.platform.app.InstrumentationRegistry
55
import androidx.test.rule.GrantPermissionRule
66
import kotlinx.coroutines.ExperimentalCoroutinesApi
77
import kotlinx.coroutines.runBlocking
8+
import network.xyo.client.payload.TestPayload1
89
import network.xyo.client.account.Account
9-
import network.xyo.client.boundwitness.XyoBoundWitnessBuilder
10+
import network.xyo.client.node.client.DiscoverPayload
1011
import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository
12+
import network.xyo.client.lib.XyoSerializable
1113
import network.xyo.client.node.client.NodeClient
1214
import network.xyo.client.payload.XyoPayload
1315
import org.junit.Before
@@ -71,7 +73,9 @@ class XyoBoundWitnessTest {
7173
@Test
7274
fun testBoundWitnessHash() {
7375
runBlocking {
74-
val bw = XyoBoundWitnessBuilder(appContext).signer(Account.random()).payloads(listOf(TestPayload1())).build()
76+
val bw = XyoBoundWitnessBuilder(appContext).signer(Account.random()).payloads(listOf(
77+
TestPayload1()
78+
)).build()
7579
val hashableFields = bw.getBodyJson()
7680
assert(bw._hash !== null)
7781
assert(bw._hash!! == XyoSerializable.sha256String(hashableFields))
@@ -83,8 +87,12 @@ class XyoBoundWitnessTest {
8387
fun testBoundWitnessPreviousHash() {
8488
runBlocking {
8589
val testAccount = Account.random()
86-
val bw = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(TestPayload1())).build()
87-
val bw2 = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(TestPayload1())).build()
90+
val bw = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(
91+
TestPayload1()
92+
)).build()
93+
val bw2 = XyoBoundWitnessBuilder(appContext).signer(testAccount).payloads(listOf(
94+
TestPayload1()
95+
)).build()
8896
assert(bw2.previous_hashes.first() == bw._hash)
8997
}
9098
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package network.xyo.client
1+
package network.xyo.client.lib
22

33
import network.xyo.client.account.Account
44
import network.xyo.client.payload.XyoPayload
@@ -26,6 +26,5 @@ class TestConstants {
2626
const val nodeUrlBeta = "https://beta.api.archivist.xyo.network"
2727
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}}}"
2828
const val queryResponseBWHash = "eb5bcbf881e5f91f8b10bb360bcb660b6e70b9ed429ac3c5c0f9b74150b59a07"
29-
const val panelBwHash = "09a4dda042973bcb69f7a7f63a8a79763760e0e2ca9b0d486d7edf72ac2288be"
3029
}
3130
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package network.xyo.client
1+
package network.xyo.client.node.client
22

33
import android.content.Context
44
import androidx.test.platform.app.InstrumentationRegistry
55
import kotlinx.coroutines.ExperimentalCoroutinesApi
66
import kotlinx.coroutines.runBlocking
7+
import network.xyo.client.lib.TestConstants
78
import network.xyo.client.account.Account
89
import network.xyo.client.archivist.wrapper.ArchivistWrapper
9-
import network.xyo.client.node.client.NodeClient
1010
import network.xyo.client.payload.XyoPayload
1111
import org.junit.Before
1212
import org.junit.Test
@@ -57,7 +57,8 @@ class NodeClientTest {
5757

5858
@Test
5959
fun archivistInsertTest() {
60-
val archivist = ArchivistWrapper(NodeClient(apiDomainBeta, TestConstants.TestAccount, appContext))
60+
val archivist = ArchivistWrapper(NodeClient(apiDomainBeta,
61+
TestConstants.TestAccount, appContext))
6162

6263
val payloads = arrayListOf(TestConstants.debugPayload)
6364

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package network.xyo.client
1+
package network.xyo.client.node.client
22

3-
import network.xyo.client.node.client.QueryResponseWrapper
3+
import network.xyo.client.lib.TestConstants
44
import org.junit.Test
55
import org.junit.jupiter.api.Assertions.*
66

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package network.xyo.client
1+
package network.xyo.client.payload
22

33
import com.squareup.moshi.JsonClass
4-
import network.xyo.client.payload.XyoPayload
54
import java.util.*
65

76
@JsonClass(generateAdapter = true)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
package network.xyo.client
1+
package network.xyo.client.payload
22

33
import android.content.Context
44
import androidx.test.platform.app.InstrumentationRegistry
55
import androidx.test.rule.GrantPermissionRule
66
import kotlinx.coroutines.CoroutineScope
77
import kotlinx.coroutines.Dispatchers
88
import kotlinx.coroutines.launch
9+
import network.xyo.client.lib.BasicPayload
10+
import network.xyo.client.lib.TestConstants
911
import network.xyo.client.account.Account
1012
import network.xyo.client.boundwitness.XyoBoundWitnessBuilder
11-
import network.xyo.client.payload.XyoPayload
13+
import network.xyo.client.lib.XyoSerializable
14+
import network.xyo.client.witness.XyoWitness
1215
import org.junit.Before
1316
import org.junit.Rule
1417
import org.junit.Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package network.xyo.client.prefs
33
import android.content.Context
44
import androidx.test.platform.app.InstrumentationRegistry
55
import kotlinx.coroutines.runBlocking
6-
import network.xyo.client.TestConstants
7-
import network.xyo.client.XyoPanel
6+
import network.xyo.client.lib.TestConstants
7+
import network.xyo.client.witness.XyoPanel
88
import network.xyo.client.account.Account
99
import network.xyo.client.boundwitness.XyoBoundWitnessBuilder
1010
import network.xyo.client.datastore.accounts.AccountPrefsRepository

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package network.xyo.client.prefs
33
import android.content.Context
44
import androidx.test.platform.app.InstrumentationRegistry
55
import kotlinx.coroutines.runBlocking
6-
import network.xyo.client.TestConstants
6+
import network.xyo.client.lib.TestConstants
77
import network.xyo.client.account.Account
88
import network.xyo.client.account.hexStringToByteArray
99
import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import android.content.Context
44
import androidx.test.platform.app.InstrumentationRegistry
55
import kotlinx.coroutines.ExperimentalCoroutinesApi
66
import kotlinx.coroutines.runBlocking
7-
import network.xyo.client.XyoEventPayload
8-
import network.xyo.client.XyoPanel
7+
import network.xyo.client.payload.XyoEventPayload
8+
import network.xyo.client.witness.XyoPanel
99
import network.xyo.client.account.model.AccountInstance
1010
import org.junit.Before
1111
import org.junit.Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
77
import androidx.test.platform.app.InstrumentationRegistry
88
import androidx.test.rule.GrantPermissionRule
99
import kotlinx.coroutines.runBlocking
10-
import network.xyo.client.TestConstants
10+
import network.xyo.client.lib.TestConstants
1111
import network.xyo.client.account.Account
1212
import network.xyo.client.boundwitness.XyoBoundWitnessBodyJson
1313
import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository

0 commit comments

Comments
 (0)