refactor some stuff

Author: w-ensink

eudi/credentials/sdjwtvc/kbjwt.go

@@ -129,6 +129,9 @@ func (c *DefaultKeyBinder) CreateKeyPairs(num uint) ([]jwk.Key, error) {
 		}
 
 		pubJwk, err := privJwk.PublicKey()
+		if err != nil {
+			return nil, fmt.Errorf("failed to obtain pub key from priv key jwk: %v", err)
+		}
 		result[i] = pubJwk
 	}
 

irmaclient/keybinding_storage_test.go

@@ -20,22 +20,30 @@ func TestKeyBindingStorage(t *testing.T) {
 	)
 }
 
-func testRetrieveSinglePrivateKeyCanOnlyBeDoneOnce(t *testing.T, storage sdjwtvc.KeyBindingStorage) {
-	privateKeys := createPrivateKeys(t, 100)
-	require.NoError(t, storage.StorePrivateKeys(privateKeys))
-
-	privJwk, err := jwk.Import(privateKeys[0])
+func getPubJwk(t *testing.T, priv *ecdsa.PrivateKey) jwk.Key {
+	privJwk, err := jwk.Import(priv)
 	require.NoError(t, err)
 	pubJwk, err := privJwk.PublicKey()
 	require.NoError(t, err)
+	return pubJwk
+}
+
+func testRetrieveSinglePrivateKeyCanOnlyBeDoneOnce(t *testing.T, storage sdjwtvc.KeyBindingStorage) {
+	privateKeys := createPrivateKeys(t, 100)
+	require.NoError(t, storage.StorePrivateKeys(privateKeys))
 
+	pubJwk := getPubJwk(t, privateKeys[0])
 	privKey, err := storage.GetAndRemovePrivateKey(pubJwk)
 	require.NoError(t, err)
 
 	require.Equal(t, privateKeys[0], privKey)
 
 	privKey, err = storage.GetAndRemovePrivateKey(pubJwk)
 	require.Error(t, err)
+
+	pubJwk = getPubJwk(t, privateKeys[1])
+	privKey, err = storage.GetAndRemovePrivateKey(pubJwk)
+	require.NoError(t, err)
 }
 
 func testStoreManyPrivateKeys(t *testing.T, storage sdjwtvc.KeyBindingStorage) {