Expose dapp interaction serialization methods and bump sargon version (…

…#155)

* Expose dapp interaction serialization methods and bump sargon version

* add tests to kotlin extension methods

* split uniffi sample methos into multiple files

* fix tests

* align extension codestyle and remove binaries

* remove redundant annotations

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sargon"
-version = "1.0.7"
+version = "1.0.8"
 edition = "2021"
 build = "build.rs"
 

jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/DappToWalletInteractionUnvalidated.kt

@@ -0,0 +1,13 @@
+package com.radixdlt.sargon.extensions
+
+import com.radixdlt.sargon.DappToWalletInteractionUnvalidated
+import com.radixdlt.sargon.dappToWalletInteractionUnvalidatedToJsonBytes
+import com.radixdlt.sargon.newDappToWalletInteractionUnvalidatedFromJsonBytes
+
+@Throws(SargonException::class)
+fun DappToWalletInteractionUnvalidated.Companion.fromJson(json: String) =
+    newDappToWalletInteractionUnvalidatedFromJsonBytes(json.toByteArray().toBagOfBytes())
+
+fun DappToWalletInteractionUnvalidated.toJson() =
+    dappToWalletInteractionUnvalidatedToJsonBytes(this).string
+

jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/WalletToDappInteractionResponse.kt

@@ -0,0 +1,12 @@
+package com.radixdlt.sargon.extensions
+
+import com.radixdlt.sargon.WalletToDappInteractionResponse
+import com.radixdlt.sargon.newWalletToDappInteractionResponseFromJsonBytes
+import com.radixdlt.sargon.walletToDappInteractionResponseToJsonBytes
+
+@Throws(SargonException::class)
+fun WalletToDappInteractionResponse.Companion.fromJson(json: String) =
+    newWalletToDappInteractionResponseFromJsonBytes(json.toByteArray().toBagOfBytes())
+
+fun WalletToDappInteractionResponse.toJson() =
+    walletToDappInteractionResponseToJsonBytes(this).string

jvm/sargon-android/src/test/java/com/radixdlt/sargon/BagOfBytesTest.kt

@@ -3,7 +3,6 @@ package com.radixdlt.sargon
 import com.radixdlt.sargon.extensions.hash
 import com.radixdlt.sargon.extensions.hex
 import com.radixdlt.sargon.extensions.hexToBagOfBytes
-import com.radixdlt.sargon.extensions.init
 import com.radixdlt.sargon.extensions.randomBagOfBytes
 import com.radixdlt.sargon.extensions.toBagOfBytes
 import com.radixdlt.sargon.samples.acedBagOfBytesSample

jvm/sargon-android/src/test/java/com/radixdlt/sargon/DappToWalletInteractionUnvalidatedTest.kt

@@ -0,0 +1,16 @@
+package com.radixdlt.sargon
+
+import com.radixdlt.sargon.extensions.fromJson
+import com.radixdlt.sargon.extensions.toJson
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class DappToWalletInteractionUnvalidatedTest {
+
+    @Test
+    fun testRoundtrip() {
+        val sample = newDappToWalletInteractionUnvalidatedSample()
+        assertEquals(sample, DappToWalletInteractionUnvalidated.Companion.fromJson(sample.toJson()))
+    }
+
+}

jvm/sargon-android/src/test/java/com/radixdlt/sargon/P2PLinkTest.kt

@@ -2,7 +2,6 @@ package com.radixdlt.sargon
 
 import com.radixdlt.sargon.extensions.clientID
 import com.radixdlt.sargon.extensions.fromJson
-import com.radixdlt.sargon.extensions.hex
 import com.radixdlt.sargon.extensions.init
 import com.radixdlt.sargon.extensions.toJson
 import com.radixdlt.sargon.samples.Sample

jvm/sargon-android/src/test/java/com/radixdlt/sargon/RadixConnectPurposeTest.kt

@@ -1,7 +1,6 @@
 package com.radixdlt.sargon
 
 import com.radixdlt.sargon.extensions.init
-import com.radixdlt.sargon.extensions.string
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 

jvm/sargon-android/src/test/java/com/radixdlt/sargon/WalletToDappInteractionResponseTest.kt

@@ -0,0 +1,16 @@
+package com.radixdlt.sargon
+
+import com.radixdlt.sargon.extensions.fromJson
+import com.radixdlt.sargon.extensions.toJson
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class WalletToDappInteractionResponseTest {
+
+    @Test
+    fun testRoundtrip() {
+        val sample = newWalletToDappInteractionResponseSample()
+        assertEquals(sample, WalletToDappInteractionResponse.Companion.fromJson(sample.toJson()))
+    }
+
+}

src/radix_connect/wallet_interaction/dapp_wallet_interaction/dapp_to_wallet/dapp_to_wallet_interaction_uniffi_fn.rs

@@ -0,0 +1,26 @@
+use crate::prelude::*;
+
+#[uniffi::export]
+pub(crate) fn new_dapp_to_wallet_interaction_unvalidated_sample(
+) -> DappToWalletInteractionUnvalidated {
+    DappToWalletInteractionUnvalidated::sample()
+}
+
+#[uniffi::export]
+pub(crate) fn new_dapp_to_wallet_interaction_unvalidated_sample_other(
+) -> DappToWalletInteractionUnvalidated {
+    DappToWalletInteractionUnvalidated::sample_other()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn inequality_of_samples() {
+        assert_ne!(
+            new_dapp_to_wallet_interaction_unvalidated_sample(),
+            new_dapp_to_wallet_interaction_unvalidated_sample_other()
+        );
+    }
+}

src/radix_connect/wallet_interaction/dapp_wallet_interaction/dapp_to_wallet/mod.rs

@@ -1,11 +1,15 @@
 mod dapp_metadata;
+mod dapp_to_wallet_interaction_uniffi_fn;
 mod interaction;
 mod interaction_items;
 mod interaction_uniffi_fn;
 mod interaction_unvalidated;
+mod wallet_to_dapp_interaction_uniffi_fn;
 
 pub use dapp_metadata::*;
+pub use dapp_to_wallet_interaction_uniffi_fn::*;
 pub use interaction::*;
 pub use interaction_items::*;
 pub use interaction_uniffi_fn::*;
 pub use interaction_unvalidated::*;
+pub use wallet_to_dapp_interaction_uniffi_fn::*;

src/radix_connect/wallet_interaction/dapp_wallet_interaction/dapp_to_wallet/wallet_to_dapp_interaction_uniffi_fn.rs

@@ -0,0 +1,26 @@
+use crate::prelude::*;
+
+#[uniffi::export]
+pub(crate) fn new_wallet_to_dapp_interaction_response_sample(
+) -> WalletToDappInteractionResponse {
+    WalletToDappInteractionResponse::sample()
+}
+
+#[uniffi::export]
+pub(crate) fn new_wallet_to_dapp_interaction_response_sample_other(
+) -> WalletToDappInteractionResponse {
+    WalletToDappInteractionResponse::sample_other()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn inequality_of_samples() {
+        assert_ne!(
+            new_wallet_to_dapp_interaction_response_sample(),
+            new_wallet_to_dapp_interaction_response_sample_other()
+        );
+    }
+}