updated tests and lint fixes

Author: blockchainluffy

rolling-shutter/keyperimpl/gnosis/validatorsyncer_test.go

@@ -8,15 +8,16 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	blst "github.com/supranational/blst/bindings/go"
+	"gotest.tools/assert"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	validatorRegistryBindings "github.com/shutter-network/gnosh-contracts/gnoshcontracts/validatorregistry"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/beaconapiclient"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/testsetup"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/validatorregistry"
-	blst "github.com/supranational/blst/bindings/go"
-	"gotest.tools/assert"
 )
 
 func TestLegacyValidatorRegisterFilterEvent(t *testing.T) {
@@ -52,7 +53,7 @@ func TestLegacyValidatorRegisterFilterEvent(t *testing.T) {
 		ChainID:         msg.ChainID,
 	}
 
-	events := []*validatorRegistryBindings.ValidatorregistryUpdated{&validatorRegistryBindings.ValidatorregistryUpdated{
+	events := []*validatorRegistryBindings.ValidatorregistryUpdated{{
 		Signature: sig.Compress(),
 		Message:   msg.Marshal(),
 		Raw: types.Log{
@@ -106,7 +107,7 @@ func TestAggregateValidatorRegisterFilterEvent(t *testing.T) {
 		ChainID:         msg.ChainID,
 	}
 
-	events := []*validatorRegistryBindings.ValidatorregistryUpdated{&validatorRegistryBindings.ValidatorregistryUpdated{
+	events := []*validatorRegistryBindings.ValidatorregistryUpdated{{
 		Signature: sig.Compress(),
 		Message:   msg.Marshal(),
 		Raw: types.Log{
@@ -121,6 +122,7 @@ func TestAggregateValidatorRegisterFilterEvent(t *testing.T) {
 }
 
 func mockBeaconClient(t *testing.T, pubKeyHex string) string {
+	t.Helper()
 	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		x := beaconapiclient.GetValidatorByIndexResponse{
 			Finalized: true,

rolling-shutter/medley/validatorregistry/validatorregistry.go

@@ -69,13 +69,12 @@ func (m *AggregateRegistrationMessage) Unmarshal(b []byte) error {
 func (m *AggregateRegistrationMessage) ValidatorIndices() []int64 {
 	if m.Version == LegacyValidatorRegistrationMessageVersion {
 		return []int64{int64(m.ValidatorIndex)}
-	} else {
-		indices := make([]int64, 0)
-		for i := 0; i < int(m.Count); i++ {
-			indices = append(indices, int64(m.ValidatorIndex)+int64(i))
-		}
-		return indices
 	}
+	indices := make([]int64, 0)
+	for i := 0; i < int(m.Count); i++ {
+		indices = append(indices, int64(m.ValidatorIndex)+int64(i))
+	}
+	return indices
 }
 
 type LegacyRegistrationMessage struct {