From 46943507b888bb9dc937320fcb721ccc98c8d969 Mon Sep 17 00:00:00 2001 From: sergiupuhalschi-rdx <164897324+sergiupuhalschi-rdx@users.noreply.github.com> Date: Tue, 5 Nov 2024 08:50:25 +0200 Subject: [PATCH] Fix kt manifest summary. Improve kt coverage (#253) * Fix kt manifest summary. Improve kt coverage * Fix version --- Cargo.lock | 4 +-- crates/sargon-uniffi/Cargo.toml | 2 +- crates/sargon/Cargo.toml | 2 +- .../sargon/extensions/TransactionManifest.kt | 2 +- .../sargon/samples/NetworkMethodSample.kt | 15 ++++++++++ .../com/radixdlt/sargon/NetworkMethodTest.kt | 29 +++++++++++++++++++ .../com/radixdlt/sargon/SubintentHashTest.kt | 22 ++++++++++++++ .../radixdlt/sargon/SubintentManifestTest.kt | 29 +++++++++++++++++++ .../java/com/radixdlt/sargon/SubintentTest.kt | 22 ++++++++++++++ .../sargon/TransactionManifestV2Test.kt | 5 +--- 10 files changed, 123 insertions(+), 9 deletions(-) create mode 100644 jvm/sargon-android/src/main/java/com/radixdlt/sargon/samples/NetworkMethodSample.kt create mode 100644 jvm/sargon-android/src/test/java/com/radixdlt/sargon/NetworkMethodTest.kt create mode 100644 jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentHashTest.kt create mode 100644 jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentManifestTest.kt create mode 100644 jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentTest.kt diff --git a/Cargo.lock b/Cargo.lock index feca98a60..8a7ba4c3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2737,7 +2737,7 @@ dependencies = [ [[package]] name = "sargon" -version = "1.1.44" +version = "1.1.45" dependencies = [ "actix-rt", "aes-gcm", @@ -2791,7 +2791,7 @@ dependencies = [ [[package]] name = "sargon-uniffi" -version = "1.1.44" +version = "1.1.45" dependencies = [ "actix-rt", "assert-json-diff", diff --git a/crates/sargon-uniffi/Cargo.toml b/crates/sargon-uniffi/Cargo.toml index 4e1e96482..1a2dc8852 100644 --- a/crates/sargon-uniffi/Cargo.toml +++ b/crates/sargon-uniffi/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sargon-uniffi" # Don't forget to update version in crates/sargon/Cargo.toml -version = "1.1.44" +version = "1.1.45" edition = "2021" build = "build.rs" diff --git a/crates/sargon/Cargo.toml b/crates/sargon/Cargo.toml index 3fbe4cc89..a9b08bcc2 100644 --- a/crates/sargon/Cargo.toml +++ b/crates/sargon/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sargon" # Don't forget to update version in crates/sargon-uniffi/Cargo.toml -version = "1.1.44" +version = "1.1.45" edition = "2021" build = "build.rs" diff --git a/jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/TransactionManifest.kt b/jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/TransactionManifest.kt index 4cbe548e8..3b8ba93f5 100644 --- a/jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/TransactionManifest.kt +++ b/jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/TransactionManifest.kt @@ -185,7 +185,7 @@ val TransactionManifest.involvedPoolAddresses: List val TransactionManifest.involvedResourceAddresses: List get() = transactionManifestInvolvedResourceAddresses(manifest = this) -val TransactionManifest.summary: ManifestSummary? +val TransactionManifest.summary: ManifestSummary get() = transactionManifestSummary(manifest = this) fun TransactionManifest.Companion.accountLockerClaim( diff --git a/jvm/sargon-android/src/main/java/com/radixdlt/sargon/samples/NetworkMethodSample.kt b/jvm/sargon-android/src/main/java/com/radixdlt/sargon/samples/NetworkMethodSample.kt new file mode 100644 index 000000000..a2dc25e01 --- /dev/null +++ b/jvm/sargon-android/src/main/java/com/radixdlt/sargon/samples/NetworkMethodSample.kt @@ -0,0 +1,15 @@ +package com.radixdlt.sargon.samples + +import com.radixdlt.sargon.NetworkMethod +import com.radixdlt.sargon.annotation.UsesSampleValues +import com.radixdlt.sargon.newNetworkMethodSample +import com.radixdlt.sargon.newNetworkMethodSampleOther + +@UsesSampleValues +val NetworkMethod.Companion.sample: Sample + get() = object : Sample { + + override fun invoke(): NetworkMethod = newNetworkMethodSample() + + override fun other(): NetworkMethod = newNetworkMethodSampleOther() + } \ No newline at end of file diff --git a/jvm/sargon-android/src/test/java/com/radixdlt/sargon/NetworkMethodTest.kt b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/NetworkMethodTest.kt new file mode 100644 index 000000000..8472dfb31 --- /dev/null +++ b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/NetworkMethodTest.kt @@ -0,0 +1,29 @@ +package com.radixdlt.sargon + +import com.radixdlt.sargon.extensions.toHttpMethod +import com.radixdlt.sargon.samples.Sample +import com.radixdlt.sargon.samples.sample +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test + +class NetworkMethodTest: SampleTestable { + + @Test + fun test() { + assertEquals( + "POST", + NetworkMethod.POST.toHttpMethod() + ) + assertEquals( + "GET", + NetworkMethod.GET.toHttpMethod() + ) + assertEquals( + "HEAD", + NetworkMethod.HEAD.toHttpMethod() + ) + } + + override val samples: List> + get() = listOf(NetworkMethod.sample) +} \ No newline at end of file diff --git a/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentHashTest.kt b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentHashTest.kt new file mode 100644 index 000000000..904e0e6b1 --- /dev/null +++ b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentHashTest.kt @@ -0,0 +1,22 @@ +package com.radixdlt.sargon + +import com.radixdlt.sargon.extensions.formatted +import com.radixdlt.sargon.extensions.init +import com.radixdlt.sargon.samples.Sample +import com.radixdlt.sargon.samples.sample +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test + +class SubintentHashTest : SampleTestable { + + override val samples: List> + get() = listOf(SubintentHash.sample) + + @Test + fun test() { + val sut = SubintentHash.init("subtxid_rdx1frcm6zzyfd08z0deu9x24sh64eccxeux4j2dv3dsqeuh9qsz4y6sy6hgte") + val actual = sut.formatted() + + assertEquals("subt...y6hgte", actual) + } +} \ No newline at end of file diff --git a/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentManifestTest.kt b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentManifestTest.kt new file mode 100644 index 000000000..1170298fd --- /dev/null +++ b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentManifestTest.kt @@ -0,0 +1,29 @@ +package com.radixdlt.sargon + +import com.radixdlt.sargon.extensions.blobs +import com.radixdlt.sargon.extensions.init +import com.radixdlt.sargon.extensions.involvedPoolAddresses +import com.radixdlt.sargon.extensions.involvedResourceAddresses +import com.radixdlt.sargon.extensions.manifestString +import com.radixdlt.sargon.samples.Sample +import com.radixdlt.sargon.samples.sample +import com.radixdlt.sargon.samples.sampleMainnet +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Test + +class SubintentManifestTest : SampleTestable { + + override val samples: List> + get() = listOf(SubintentManifest.sample) + + @Test + fun test() { + val manifest = SubintentManifest.sample() + + assertTrue(manifest.manifestString.contains("CALL_METHOD")) + assertEquals(Blobs.init(emptyList()), manifest.blobs) + assertEquals(emptyList(), manifest.involvedPoolAddresses) + assertEquals(listOf(ResourceAddress.sampleMainnet()), manifest.involvedResourceAddresses) + } +} \ No newline at end of file diff --git a/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentTest.kt b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentTest.kt new file mode 100644 index 000000000..6d4e7ffbf --- /dev/null +++ b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/SubintentTest.kt @@ -0,0 +1,22 @@ +package com.radixdlt.sargon + +import com.radixdlt.sargon.extensions.hash +import com.radixdlt.sargon.extensions.init +import com.radixdlt.sargon.samples.Sample +import com.radixdlt.sargon.samples.sample +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test + +class SubintentTest : SampleTestable { + + override val samples: List> + get() = listOf(Subintent.sample) + + @Test + fun test() { + assertEquals( + SubintentHash.init("subtxid_rdx1xput628m2l7jjweefd70gnq3t3a5x2gjeljduwm7vwly94s8ullql92sa0"), + Subintent.sample().hash() + ) + } +} \ No newline at end of file diff --git a/jvm/sargon-android/src/test/java/com/radixdlt/sargon/TransactionManifestV2Test.kt b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/TransactionManifestV2Test.kt index 637b0f472..b03a20ff4 100644 --- a/jvm/sargon-android/src/test/java/com/radixdlt/sargon/TransactionManifestV2Test.kt +++ b/jvm/sargon-android/src/test/java/com/radixdlt/sargon/TransactionManifestV2Test.kt @@ -1,17 +1,14 @@ package com.radixdlt.sargon -import com.radixdlt.sargon.Blobs import com.radixdlt.sargon.extensions.blobs -import com.radixdlt.sargon.extensions.manifestString import com.radixdlt.sargon.extensions.involvedPoolAddresses import com.radixdlt.sargon.extensions.involvedResourceAddresses -import com.radixdlt.sargon.extensions.networkId +import com.radixdlt.sargon.extensions.manifestString import com.radixdlt.sargon.extensions.summary import com.radixdlt.sargon.extensions.toList import com.radixdlt.sargon.samples.Sample import com.radixdlt.sargon.samples.sample import com.radixdlt.sargon.samples.sampleMainnet -import com.radixdlt.sargon.samples.sampleStokenet import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test