java and golang on macos enabled (#316)

fundthmcalculus · web-flow · commit f9eb69e9ca0f · 2021-12-26T18:46:16.000-05:00
diff --git a/.github/workflows/build-golang.yml b/.github/workflows/build-golang.yml
@@ -1,4 +1,4 @@
-name: Go
+name: Golang
 
 on:
   workflow_call:
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest] # , 'macos-latest' ] disabled due to macos issues
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - uses: actions/checkout@v2
       - name: Download workflow artifact
diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest] # , macos-latest ] - disabled due to interesting macos issues
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml
@@ -1,4 +1,4 @@
-name: Build Python SDK
+name: Python
 
 on:
   workflow_call:
diff --git a/.github/workflows/release-java.yml b/.github/workflows/release-java.yml
@@ -1,4 +1,4 @@
-name: Release Java Maven Package
+name: Java (Release)
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
@@ -1,4 +1,4 @@
-name: Release Python SDK
+name: Python (release)
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/release-ruby.yml b/.github/workflows/release-ruby.yml
@@ -1,4 +1,4 @@
-name: Release Ruby Gem
+name: Ruby (release)
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/release-wasm.yml b/.github/workflows/release-wasm.yml
@@ -1,4 +1,4 @@
-name: "Wasm (Release)"
+name: "Wasm (release)"
 
 on:
   workflow_dispatch:
diff --git a/java/src/test/java/Base58.java b/java/src/test/java/Base58.java
@@ -1,3 +1,5 @@
+import java.util.Arrays;
+
 public class Base58 {
 
     private static final char[] ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
@@ -6,17 +8,15 @@ public class Base58 {
     private static final int BASE_256 = 256;
 
     private static final int[] INDEXES = new int[128];
+
     static {
-        for (int i = 0; i < INDEXES.length; i++) {
-            INDEXES[i] = -1;
-        }
+        Arrays.fill(INDEXES, -1);
         for (int i = 0; i < ALPHABET.length; i++) {
             INDEXES[ALPHABET[i]] = i;
         }
     }
 
 
-
     public static String encode(byte[] input) {
         if (input.length == 0) {
             // paying with the same coin
diff --git a/java/src/test/java/Hex.java b/java/src/test/java/Hex.java
@@ -5,7 +5,7 @@ public static byte[] hexStringToByteArray(String s) {
         byte[] data = new byte[len / 2];
         for (int i = 0; i < len; i += 2) {
             data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
-                    + Character.digit(s.charAt(i+1), 16));
+                    + Character.digit(s.charAt(i + 1), 16));
         }
         return data;
     }
diff --git a/java/src/test/java/LdProofTest.java b/java/src/test/java/LdProofTest.java
@@ -13,6 +13,10 @@
 import java.util.HashMap;
 
 public class LdProofTest {
+    private static Value stringValue(String s) {
+        return Value.newBuilder().setStringValue(s).build();
+    }
+
     @Test
     public void testGenerateCapabilityInvocationProofWithJcs() throws InvalidProtocolBufferException, DidException {
         var proofDict = new HashMap<String, Value>();
@@ -41,7 +45,4 @@ public void testGenerateCapabilityInvocationProofWithJcs() throws InvalidProtoco
         Assertions.assertNotNull(signedCapability);
         Assertions.assertNotNull(signedCapability.getSignedDocument());
     }
-    private static Value stringValue(String s) {
-        return Value.newBuilder().setStringValue(s).build();
-    }
 }
diff --git a/java/src/test/java/OberonTest.java b/java/src/test/java/OberonTest.java
@@ -10,7 +10,7 @@ class OberonTest {
     @Test
     void testOberonDemo() throws InvalidProtocolBufferException, DidException {
         var key = Oberon.createKey(Security.CreateOberonKeyRequest.newBuilder().build());
-        final ByteString data = ByteString.copyFromUtf8( "alice");
+        final ByteString data = ByteString.copyFromUtf8("alice");
         final ByteString nonce = ByteString.copyFromUtf8("1234");
 
         var token = Oberon.createToken(Security.CreateOberonTokenRequest.newBuilder()
@@ -35,7 +35,7 @@ void testOberonDemo() throws InvalidProtocolBufferException, DidException {
     @Test
     void testDemoWithBlinding() throws InvalidProtocolBufferException, DidException {
         var key = Oberon.createKey(Security.CreateOberonKeyRequest.newBuilder().build());
-        final ByteString data = ByteString.copyFromUtf8( "alice");
+        final ByteString data = ByteString.copyFromUtf8("alice");
         final ByteString nonce = ByteString.copyFromUtf8("1234");
         final ByteString issuer_2fa = ByteString.copyFromUtf8("issuer code");
 
diff --git a/java/src/test/java/OkapiNativeTest.java b/java/src/test/java/OkapiNativeTest.java
@@ -13,12 +13,12 @@
 class OkapiNativeTest {
     @Test
     void generateKeyCall() throws DidException, InvalidProtocolBufferException {
-       Keys.GenerateKeyRequest request = Keys.GenerateKeyRequest.newBuilder()
+        Keys.GenerateKeyRequest request = Keys.GenerateKeyRequest.newBuilder()
                 .setKeyType(Keys.KeyType.KEY_TYPE_ED25519)
-                .setSeed(ByteString.copyFrom(new byte[]{1,2,3}))
+                .setSeed(ByteString.copyFrom(new byte[]{1, 2, 3}))
                 .build();
 
-        Keys.GenerateKeyResponse response= DidKey.generate(request);
+        Keys.GenerateKeyResponse response = DidKey.generate(request);
         Assertions.assertNotNull(response);
     }
 
@@ -28,7 +28,7 @@ void generateKeyNoSeed() throws DidException, InvalidProtocolBufferException {
                 .setKeyType(Keys.KeyType.KEY_TYPE_ED25519)
                 .build();
 
-        Keys.GenerateKeyResponse response= DidKey.generate(request);
+        Keys.GenerateKeyResponse response = DidKey.generate(request);
         var pk = assertValidKeyGenerated(response, null);
     }
 
@@ -50,12 +50,6 @@ void testGenerateKeyThrowsInvalidSeedType() throws DidException {
         Assertions.assertThrows(DidException.class, () -> DidKey.generate(request));
     }
 
-    private class DataArgument {
-        public Keys.KeyType keyType;
-        public String keyTypeString;
-        public String seed;
-        public String response;
-    }
     private DataArgument getArguments(int index) {
         if (index == 1) {
             var arg = new DataArgument();
@@ -91,7 +85,7 @@ void testGenerateKeyFromSeed(int index) throws DidException, InvalidProtocolBuff
     }
 
     byte[] assertValidKeyGenerated(Keys.GenerateKeyResponse response, String crv) {
-        if (crv == null) crv ="Ed25519";
+        if (crv == null) crv = "Ed25519";
 
         Assertions.assertNotNull(response);
         var key = response.getKey(0);
@@ -101,8 +95,8 @@ byte[] assertValidKeyGenerated(Keys.GenerateKeyResponse response, String crv) {
         var x = Base64.getUrlDecoder().decode(base64Padding(key.getX()));
         var y = Base64.getUrlDecoder().decode(base64Padding(key.getY()));
         var publicKey = new byte[x.length + y.length];
-        System.arraycopy(x,0, publicKey, 0, x.length);
-        System.arraycopy(y,0, publicKey, x.length, y.length);
+        System.arraycopy(x, 0, publicKey, 0, x.length);
+        System.arraycopy(y, 0, publicKey, x.length, y.length);
         Assertions.assertNotNull(publicKey);
         Assertions.assertEquals(32, publicKey.length);
         var response64 = Base64.getUrlDecoder().decode(base64Padding(key.getD()));
@@ -119,4 +113,11 @@ else if (stringShort == 3)
             s += "=";
         return s;
     }
+
+    private static class DataArgument {
+        public Keys.KeyType keyType;
+        public String keyTypeString;
+        public String seed;
+        public String response;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Build Python SDK`
	`1`	`+name: Python`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`workflow_call:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Release Java Maven Package`
	`1`	`+name: Java (Release)`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`workflow_dispatch:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Release Python SDK`
	`1`	`+name: Python (release)`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`workflow_dispatch:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Release Ruby Gem`
	`1`	`+name: Ruby (release)`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`workflow_dispatch:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: "Wasm (Release)"`
	`1`	`+name: "Wasm (release)"`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`workflow_dispatch:`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ public static byte[] hexStringToByteArray(String s) {`
`5`	`5`	`byte[] data = new byte[len / 2];`
`6`	`6`	`for (int i = 0; i < len; i += 2) {`
`7`	`7`	`data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)`
`8`		`- + Character.digit(s.charAt(i+1), 16));`
	`8`	`+ + Character.digit(s.charAt(i + 1), 16));`
`9`	`9`	`}`
`10`	`10`	`return data;`
`11`	`11`	`}`