From a0013a9c260642d904622a48b9fb89cbddeb4d22 Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Tue, 16 Feb 2021 00:27:18 +0100
Subject: [PATCH 1/2] tests(dubp): add test for legacy dewif

---
 native/dubp_rs/src/legacy.rs | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/native/dubp_rs/src/legacy.rs b/native/dubp_rs/src/legacy.rs
index 049b6d1..45aef12 100644
--- a/native/dubp_rs/src/legacy.rs
+++ b/native/dubp_rs/src/legacy.rs
@@ -49,3 +49,34 @@ pub(super) fn sign(salt: &str, password: &str, msg: &str) -> String {
         .sign(msg.as_bytes())
         .to_base64()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_dewif_legacy() -> Result<(), DubpError> {
+        let wallet = gen_dewif_from_legacy(
+            "g1",
+            "salt".to_owned(),
+            "pass".to_owned(),
+            false,
+            SecretCodeType::Letters,
+            1_000_000_000,
+        )?;
+        let dewif = &wallet[0];
+        let secret_code = &wallet[1];
+        let pubkey = &wallet[2];
+
+        assert_eq!(pubkey, "3YumN7F7D8c2hmkHLHf3ZD8wc3tBHiECEK9zLPkaJtAF");
+
+        assert_eq!(get_pubkey("salt", "pass"), pubkey.to_owned());
+
+        assert_eq!(
+            crate::dewif::get_pubkey(Currency::from(G1_CURRENCY), &dewif, &secret_code)?,
+            pubkey.to_owned()
+        );
+
+        Ok(())
+    }
+}

From 03f301a6f5ddf907de9bc83b5ccfb84f1204a164 Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Tue, 16 Feb 2021 00:27:38 +0100
Subject: [PATCH 2/2] fix(dubp): get_legacy_pubkey params order

---
 packages/dubp_rs/lib/dubp.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dubp_rs/lib/dubp.dart b/packages/dubp_rs/lib/dubp.dart
index da50c41..d5efb5c 100644
--- a/packages/dubp_rs/lib/dubp.dart
+++ b/packages/dubp_rs/lib/dubp.dart
@@ -256,8 +256,8 @@ class DubpRust {
         singleCompletePort<String, String>(completer, callback: _handleErr);
     native.get_legacy_pubkey(
       sendPort.nativePort,
-      Utf8.toUtf8(password),
       Utf8.toUtf8(salt),
+      Utf8.toUtf8(password),
     );
     return completer.future;
   }