From 3a244ba6c72adae7068ceebc384d73ec3f732013 Mon Sep 17 00:00:00 2001 From: Devayan Sarkar Date: Sun, 18 Oct 2020 17:34:51 +0200 Subject: [PATCH 1/2] fixing typo on `setTranferType` to `setTransferType` --- .../org/kin/sdk/base/KinAccountContext.kt | 2 +- .../org/kin/sdk/base/models/KinBinaryMemo.kt | 2 +- .../org/kin/sdk/base/KinServiceImplTest.kt | 2 +- .../kin/sdk/base/models/KinBinaryMemoTest.kt | 32 +++++++++---------- .../modern/ModernSendTransactionViewModel.kt | 2 +- .../ModernTransactionLoadTestingViewModel.kt | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/base/src/main/java/org/kin/sdk/base/KinAccountContext.kt b/base/src/main/java/org/kin/sdk/base/KinAccountContext.kt index ee431cc..b8f2c65 100644 --- a/base/src/main/java/org/kin/sdk/base/KinAccountContext.kt +++ b/base/src/main/java/org/kin/sdk/base/KinAccountContext.kt @@ -473,7 +473,7 @@ class KinAccountContextImpl private constructor( destinationAccount, KinBinaryMemo.Builder(processingAppIdx.value) .setForeignKey(listOf(invoice).toProto().sha224Hash().decode()) - .setTranferType(type) + .setTransferType(type) .build() .toKinMemo(), Optional.of(invoice) diff --git a/base/src/main/java/org/kin/sdk/base/models/KinBinaryMemo.kt b/base/src/main/java/org/kin/sdk/base/models/KinBinaryMemo.kt index d254dee..f10d481 100644 --- a/base/src/main/java/org/kin/sdk/base/models/KinBinaryMemo.kt +++ b/base/src/main/java/org/kin/sdk/base/models/KinBinaryMemo.kt @@ -83,7 +83,7 @@ data class KinBinaryMemo internal constructor( private var typeId: TransferType? = null private var foreignKeyBytes: ByteArray? = null - fun setTranferType(typeId: TransferType): Builder = + fun setTransferType(typeId: TransferType): Builder = also { this.typeId = typeId } fun setForeignKey(foreignKeyBytes: ByteArray): Builder = diff --git a/base/src/test/kotlin/org/kin/sdk/base/KinServiceImplTest.kt b/base/src/test/kotlin/org/kin/sdk/base/KinServiceImplTest.kt index 0b5ecdd..c65b52c 100644 --- a/base/src/test/kotlin/org/kin/sdk/base/KinServiceImplTest.kt +++ b/base/src/test/kotlin/org/kin/sdk/base/KinServiceImplTest.kt @@ -982,7 +982,7 @@ class KinServiceImplTest { listOf(KinPaymentItem(KinAmount(123), destinationAccount.id, Optional.of(invoice))), KinBinaryMemo.Builder(destinationKinAppIdx.value) .setForeignKey(invoiceList.id.invoiceHash.decode()) - .setTranferType(KinBinaryMemo.TransferType.Spend) + .setTransferType(KinBinaryMemo.TransferType.Spend) .build() .toKinMemo(), QuarkAmount(100) diff --git a/base/src/test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt b/base/src/test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt index 959f9f3..d21e409 100644 --- a/base/src/test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt +++ b/base/src/test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt @@ -14,7 +14,7 @@ class KinBinaryMemoTest { @Test fun testAgoraEncoding_specicFK() { val agoraMemo = KinBinaryMemo.Builder(10, 1, 2) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(byteArrayOf(0xAE.toByte(), 0xFD.toByte())) .build() @@ -34,7 +34,7 @@ class KinBinaryMemoTest { (0..500).forEach { println("index: $it") val agoraMemo = KinBinaryMemo.Builder(10, 1, 2) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray()) .build() @@ -67,7 +67,7 @@ class KinBinaryMemoTest { (0..500).forEach { println("index: $it") val agoraMemo = KinBinaryMemo.Builder(10, 1, 2) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() @@ -98,7 +98,7 @@ class KinBinaryMemoTest { fun testAgoraEncoding_appIdx_validRange() { (0..65535).forEach { index -> val agoraMemo = KinBinaryMemo.Builder(index, 3, 7) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() @@ -117,7 +117,7 @@ class KinBinaryMemoTest { @Test(expected = KinBinaryMemo.Builder.KinBinaryMemoFormatException::class) fun testAgoraEncoding_appIdx_invalid_tooSmall() { KinBinaryMemo.Builder(appIdx = -1, magicByteIndicator = 1, version = 7) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() } @@ -125,7 +125,7 @@ class KinBinaryMemoTest { @Test(expected = KinBinaryMemo.Builder.KinBinaryMemoFormatException::class) fun testAgoraEncoding_appIdx_invalid_tooLarge() { KinBinaryMemo.Builder(65536, 1, 2) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() } @@ -140,7 +140,7 @@ class KinBinaryMemoTest { @Test fun testAgoraEncoding_no_fk_default_0s() { val memo = KinBinaryMemo.Builder(123, 1, 2) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .build() assertTrue { @@ -182,7 +182,7 @@ class KinBinaryMemoTest { fun testAgoraEncoding_magicByteIndicator_validRange() { (0..3).forEach { index -> val agoraMemo = KinBinaryMemo.Builder(65535, index, 7) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() @@ -202,7 +202,7 @@ class KinBinaryMemoTest { @Test(expected = KinBinaryMemo.Builder.KinBinaryMemoFormatException::class) fun testAgoraEncoding_magicByteIndicator_invalid_tooSmall() { KinBinaryMemo.Builder(65535, -1, 7) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() } @@ -210,7 +210,7 @@ class KinBinaryMemoTest { @Test(expected = KinBinaryMemo.Builder.KinBinaryMemoFormatException::class) fun testAgoraEncoding_magicByteIndicator_invalid_tooLarge() { KinBinaryMemo.Builder(65535, 3, 8) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() } @@ -219,7 +219,7 @@ class KinBinaryMemoTest { fun testAgoraEncoding_version_validRange() { (0..7).forEach { index -> val agoraMemo = KinBinaryMemo.Builder(65535, 3, index) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() @@ -238,7 +238,7 @@ class KinBinaryMemoTest { @Test(expected = KinBinaryMemo.Builder.KinBinaryMemoFormatException::class) fun testAgoraEncoding_version_invalid_tooSmall() { KinBinaryMemo.Builder(65535, 3, -1) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() } @@ -246,7 +246,7 @@ class KinBinaryMemoTest { @Test(expected = KinBinaryMemo.Builder.KinBinaryMemoFormatException::class) fun testAgoraEncoding_version_invalid_tooLarge() { KinBinaryMemo.Builder(65535, 3, 8) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() } @@ -256,7 +256,7 @@ class KinBinaryMemoTest { fun verifyTypeId(inputTypeId: KinBinaryMemo.TransferType) { val agoraMemo = KinBinaryMemo.Builder(65535, 3, 7) - .setTranferType(inputTypeId) + .setTransferType(inputTypeId) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() @@ -281,7 +281,7 @@ class KinBinaryMemoTest { @Test(expected = KinBinaryMemo.Builder.KinBinaryMemoFormatException::class) fun testAgoraEncoding_typeId_invalid_tooSmall() { KinBinaryMemo.Builder(65535, 3, -1) - .setTranferType(KinBinaryMemo.TransferType.ANY(-1)) + .setTransferType(KinBinaryMemo.TransferType.ANY(-1)) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() } @@ -289,7 +289,7 @@ class KinBinaryMemoTest { @Test(expected = KinBinaryMemo.Builder.KinBinaryMemoFormatException::class) fun testAgoraEncoding_typeId_invalid_tooLarge() { KinBinaryMemo.Builder(65535, 3, 8) - .setTranferType(KinBinaryMemo.TransferType.ANY(32)) + .setTransferType(KinBinaryMemo.TransferType.ANY(32)) .setForeignKey(UUID.randomUUID().toByteArray() + UUID.randomUUID().toByteArray()) .build() } diff --git a/demo/viewmodel-modern/src/main/java/org/kin/sdk/demo/viewmodel/modern/ModernSendTransactionViewModel.kt b/demo/viewmodel-modern/src/main/java/org/kin/sdk/demo/viewmodel/modern/ModernSendTransactionViewModel.kt index e68753d..c942baa 100644 --- a/demo/viewmodel-modern/src/main/java/org/kin/sdk/demo/viewmodel/modern/ModernSendTransactionViewModel.kt +++ b/demo/viewmodel-modern/src/main/java/org/kin/sdk/demo/viewmodel/modern/ModernSendTransactionViewModel.kt @@ -55,7 +55,7 @@ class ModernSendTransactionViewModel( KinAmount(amount), KinAccount.Id(destinationAddress), KinBinaryMemo.Builder(DEMO_APP_IDX.value) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .build() .toKinMemo() ).then({ diff --git a/demo/viewmodel-modern/src/main/java/org/kin/sdk/demo/viewmodel/modern/ModernTransactionLoadTestingViewModel.kt b/demo/viewmodel-modern/src/main/java/org/kin/sdk/demo/viewmodel/modern/ModernTransactionLoadTestingViewModel.kt index de050eb..03a2775 100644 --- a/demo/viewmodel-modern/src/main/java/org/kin/sdk/demo/viewmodel/modern/ModernTransactionLoadTestingViewModel.kt +++ b/demo/viewmodel-modern/src/main/java/org/kin/sdk/demo/viewmodel/modern/ModernTransactionLoadTestingViewModel.kt @@ -44,7 +44,7 @@ class ModernTransactionLoadTestingViewModel( KinAmount(10), KinAccount.Id(destinationAddress), KinBinaryMemo.Builder(DemoAppConfig.DEMO_APP_IDX.value) - .setTranferType(KinBinaryMemo.TransferType.P2P) + .setTransferType(KinBinaryMemo.TransferType.P2P) .build() .toKinMemo() ).then({ From 4610a66683b2439c4b5bde327c79edbd16d9fa2f Mon Sep 17 00:00:00 2001 From: Devayan Sarkar Date: Sun, 18 Oct 2020 17:35:43 +0200 Subject: [PATCH 2/2] typo on specific --- .../test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt b/base/src/test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt index d21e409..b5e20d6 100644 --- a/base/src/test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt +++ b/base/src/test/kotlin/org/kin/sdk/base/models/KinBinaryMemoTest.kt @@ -12,7 +12,7 @@ import kotlin.test.assertTrue class KinBinaryMemoTest { @Test - fun testAgoraEncoding_specicFK() { + fun testAgoraEncoding_specificFK() { val agoraMemo = KinBinaryMemo.Builder(10, 1, 2) .setTransferType(KinBinaryMemo.TransferType.P2P) .setForeignKey(byteArrayOf(0xAE.toByte(), 0xFD.toByte()))