Merge branch 'master' into jordan/localnet-build-opts

Author: jordanschalm

cmd/execution/README.md

@@ -68,11 +68,6 @@ required to trigger this condition is put in place to prevent triggering it in c
 happen on unstable networks.
 EN keeps track of the highest block it has executed. This is not a Flow protocol feature, and only serves synchronisation needs.
 
-### Execution State syncing
-Other execution node is queried for range of missing blocks and hold authority to decide if it's willing (and able) to answer this query.
-If so, it sends the `ExecutionStateDelta` which contains all the block data and results of execution.
-Currently, this is fully trusted operation, meaning data is applied as-is without any extra checks.
-
 ### Missing blocks
 If no other EN are available, the block-level synchronisation is started. This requests blocks from consensus nodes, and
 incoming blocks are processed as if they were received during normal mode of operation

crypto/bls12381_utils_test.go

@@ -4,7 +4,7 @@
 package crypto
 
 import (
-	"crypto/rand"
+	crand "crypto/rand"
 	"encoding/hex"
 	"testing"
 
@@ -15,7 +15,7 @@ import (
 func TestDeterministicKeyGen(t *testing.T) {
 	// 2 keys generated with the same seed should be equal
 	seed := make([]byte, KeyGenSeedMinLen)
-	n, err := rand.Read(seed)
+	n, err := crand.Read(seed)
 	require.Equal(t, n, KeyGenSeedMinLen)
 	require.NoError(t, err)
 	sk1, err := GeneratePrivateKey(BLSBLS12381, seed)
@@ -30,7 +30,7 @@ func TestPRGseeding(t *testing.T) {
 	blsInstance.reInit()
 	// 2 scalars generated with the same seed should be equal
 	seed := make([]byte, KeyGenSeedMinLen)
-	n, err := rand.Read(seed)
+	n, err := crand.Read(seed)
 	require.Equal(t, n, KeyGenSeedMinLen)
 	require.NoError(t, err)
 	// 1st scalar (wrapped in a private key)
@@ -51,7 +51,8 @@ func TestPRGseeding(t *testing.T) {
 func BenchmarkScalarMultG1G2(b *testing.B) {
 	blsInstance.reInit()
 	seed := make([]byte, securityBits/8)
-	_, _ = rand.Read(seed)
+	_, err := crand.Read(seed)
+	require.NoError(b, err)
 	_ = seedRelic(seed)
 	var expo scalar
 	randZr(&expo)
@@ -139,7 +140,8 @@ func TestSubgroupCheck(t *testing.T) {
 	blsInstance.reInit()
 	// seed Relic PRG
 	seed := make([]byte, securityBits/8)
-	_, _ = rand.Read(seed)
+	_, err := crand.Read(seed)
+	require.NoError(t, err)
 	_ = seedRelic(seed)
 
 	t.Run("G1", func(t *testing.T) {