Merge pull request #14 from nats-io/start-2-0-2

Start 2.0.2

Author: scottf

README.md

@@ -4,7 +4,7 @@
 
 The library allows you to create and use NKEYS in Java code.
 
-**Current Release**: 1.5.2   **Current Snapshot**: 2.0.0-SNAPSHOT
+**Current Release**: 2.0.1   **Current Snapshot**: 2.0.2-SNAPSHOT
 
 [![License Apache 2](https://img.shields.io/badge/License-Apache2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.nats/nkeys-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.nats/nkeys-java)

build.gradle

@@ -11,7 +11,7 @@ plugins {
     id 'signing'
 }
 
-def jarVersion = "2.0.1"
+def jarVersion = "2.0.2"
 group = 'io.nats'
 
 def isMerge = System.getenv("BUILD_EVENT") == "push"

src/test/java/io/nats/nkey/NKeyTests.java

@@ -35,6 +35,7 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.Base64;
@@ -617,4 +618,35 @@ public void testClear() throws Exception {
 
         }, "Invalid encoding");
     }
+
+    @Test
+    public void testPublicKeyFromSeed() throws Exception {
+        // using nsc generated seeds for testing
+        NKey pk = NKey.fromSeed("SOAELH6NJCEK4HST5644G4HK7TOAFZGRRJHNM4EUKUY7PPNDLIKO5IH4JM".toCharArray());
+        assertEquals("ODPWIBQJVIQ42462QAFI2RKJC4RZHCQSIVPRDDHWFCJAP52NRZK6Z2YC", new String(pk.getPublicKey()));
+
+        pk = NKey.fromSeed("SAANWFZ3JINNPERWT3ALE45U7GYT2ZDW6GJUIVPDKUF6GKAX6AISZJMAS4".toCharArray());
+        assertEquals("AATEJXG7UX4HFJ6ZPRTP22P6OYZER36YYD3GVBOVW7QHLU32P4QFFTZJ", new String(pk.getPublicKey()));
+
+        pk = NKey.fromSeed("SUAGDLNBWI2SGHDRYBHD63NH5FGZSVJUW2J7GAJZXWANQFLDW6G5SXZESU".toCharArray());
+        assertEquals("UBICBTHDKQRB4LIYA6BMIJ7EA2G7YS7FIWMMVKZJE6M3HS5IVCOLKDY2", new String(pk.getPublicKey()));
+    }
+
+    @Test
+    public void testFromPublicKey() throws Exception {
+        _testFromPublicKey("SUAHBVFYZF3DIEO4UIHIZMJICVLURLBM5JJPK7GSVGP2QUC3NZ323BRE6A", "UCM5BG6AAZSEGREBCLG7PG4GFQNJABSAVIXC6VWS7TDHZFPIYFVYHIDG");
+        _testFromPublicKey("SAADARCQJ3JA737Z443YNAZBNJNTFP7YNAF4QFUXKTBFBS4KAVK55DGSOQ", "AD2HQTUKOPBUGOPHA6KFRE6ZW5TH43D7P7E56OAQBZQLW2ECMNML6MVA");
+        _testFromPublicKey("SNAH645525YA4PNXHWWS46VNXXQTYAXOPKGHXYAHXZZ43XTDDG2ZQAX7LY", "NBZCD2OSMSDRVYCAI77HUN6A2WNDWNT2DMVVEW66DHNWCDXVOUWRCCK7");
+        _testFromPublicKey("SOAF5OP7UPK6XJCMNRYEJRET6YQSOE3FD4I4ERSN6WKHLYUC5AQDCOAFVY", "OA6SJACXYP2QGNLU4QYLJTVRVZPCZEEUNO2UQOVNGXYUPUJJHCVZIZQ2");
+        _testFromPublicKey("SCAP4LGVURDWVL37AZIM5O47UKANFI6FKBY77HMYF55CKW2XFKLNUBTTFE", "CAO36T42KFA2LMIZ6YHJKPQEJWT5ULYSV633FWBCEJ7MREZPHHC56BSC");
+    }
+
+    private static void _testFromPublicKey(String userEncodedSeed, String userEncodedPubKey) throws GeneralSecurityException, IOException {
+        NKey fromSeed = NKey.fromSeed(userEncodedSeed.toCharArray());
+        NKey fromKey = NKey.fromPublicKey(fromSeed.getPublicKey());
+
+        assertArrayEquals(fromSeed.getPublicKey(), fromKey.getPublicKey());
+        assertArrayEquals(userEncodedPubKey.toCharArray(), fromSeed.getPublicKey());
+        assertArrayEquals(userEncodedPubKey.toCharArray(), fromKey.getPublicKey());
+    }
 }