Merge pull request #45 from dusk-network/fix-eof

Retry random key generation, in case of EOF

pkg/core/consensus/user/keys.go

@@ -21,7 +21,17 @@ type Keys struct {
 // NewRandKeys will generate and return new bls and ed25519
 // keys to be used in consensus
 func NewRandKeys() (Keys, error) {
-	return NewKeysFromReader(nil)
+	var keys Keys
+	var err error
+	for {
+		keys, err = NewKeysFromReader(nil)
+		if err == io.EOF {
+			continue
+		}
+		break
+	}
+
+	return keys, err
 }
 
 // NewKeysFromReader takes a reader and uses it as a seed for generating random user.Keys

pkg/core/consensus/user/keys_test.go

@@ -1,21 +1,44 @@
 package user
 
 import (
+	"io"
 	"testing"
 
 	crypto "github.com/dusk-network/dusk-crypto/hash"
 	"github.com/stretchr/testify/assert"
 )
 
+// Test that NewRandKeys does not ever return an EOF error
+func TestNewRandKeys(t *testing.T) {
+	keys, err := NewRandKeys()
+	if err == io.EOF {
+		t.Fatal("got EOF: NewRandKeys should never give an EOF error")
+	}
+
+	assert.NoError(t, err)
+	assert.NotNil(t, keys)
+}
+
 func TestDeterministicKeyGen(t *testing.T) {
-	seed, err := crypto.RandEntropy(128)
-	assert.Nil(t, err)
+	var firstKeyPair, secondKeyPair Keys
+	for {
+		seed, err := crypto.RandEntropy(128)
+		assert.Nil(t, err)
+
+		firstKeyPair, err = NewKeysFromBytes(seed)
+		if err == io.EOF {
+			continue
+		}
+		assert.Nil(t, err)
 
-	firstKeyPair, err := NewKeysFromBytes(seed)
-	assert.Nil(t, err)
+		secondKeyPair, err = NewKeysFromBytes(seed)
+		if err == io.EOF {
+			continue
+		}
+		assert.Nil(t, err)
 
-	secondKeyPair, err := NewKeysFromBytes(seed)
-	assert.Nil(t, err)
+		break
+	}
 
 	assert.Equal(t, firstKeyPair.BLSPubKeyBytes, secondKeyPair.BLSPubKeyBytes)
 	assert.Equal(t, firstKeyPair.EdPubKeyBytes, secondKeyPair.EdPubKeyBytes)