integration data test

Author: blockchainluffy

rolling-shutter/keyperimpl/gnosis/validatorsyncer_integration_test.go

@@ -0,0 +1,101 @@
+package gnosis
+
+import (
+	"context"
+	"encoding/hex"
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	validatorRegistryBindings "github.com/shutter-network/gnosh-contracts/gnoshcontracts/validatorregistry"
+	"gotest.tools/assert"
+
+	"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"
+)
+
+func TestAggregateValidationWithData(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+	ctx := context.Background()
+	url := mockBeaconClientWithJSONData(t)
+	cl, err := beaconapiclient.New(url)
+	assert.NilError(t, err)
+	dbpool, dbclose := testsetup.NewTestDBPool(ctx, t, database.Definition)
+	t.Cleanup(dbclose)
+	vs := ValidatorSyncer{
+		BeaconAPIClient: cl,
+		DBPool:          dbpool,
+		ChainID:         10200,
+	}
+
+	msg := readMsg(t)
+
+	message, err := hex.DecodeString(msg["message"][2:])
+	assert.NilError(t, err)
+
+	signature, err := hex.DecodeString(msg["signature"][2:])
+	assert.NilError(t, err)
+
+	events := []*validatorRegistryBindings.ValidatorregistryUpdated{{
+		Signature: signature,
+		Message:   message,
+		Raw: types.Log{
+			Address: common.HexToAddress("0xa9289A3Dd14FEBe10611119bE81E5d35eAaC3084"),
+		},
+	}}
+
+	finalEvents, err := vs.filterEvents(ctx, events)
+	assert.NilError(t, err)
+
+	assert.DeepEqual(t, len(finalEvents), 1)
+}
+
+func mockBeaconClientWithJSONData(t *testing.T) string {
+	t.Helper()
+	jsonFile, err := os.Open("../../../testdata/validatorInfo.json")
+	assert.NilError(t, err)
+	defer jsonFile.Close()
+
+	byteValue, _ := io.ReadAll(jsonFile)
+	var result map[string]string
+	json.Unmarshal([]byte(byteValue), &result)
+
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		parts := strings.Split(r.URL.Path, "/")
+
+		x := beaconapiclient.GetValidatorByIndexResponse{
+			Finalized: true,
+			Data: beaconapiclient.ValidatorData{
+				Validator: beaconapiclient.Validator{
+					PubkeyHex: result[parts[len(parts)-1]],
+				},
+			},
+		}
+		res, err := json.Marshal(x)
+		assert.NilError(t, err)
+		w.WriteHeader(http.StatusOK)
+		_, err = w.Write(res)
+		assert.NilError(t, err)
+	})).URL
+}
+
+func readMsg(t *testing.T) map[string]string {
+	t.Helper()
+	jsonFile, err := os.Open("../../../testdata/signedRegistrations.json")
+	assert.NilError(t, err)
+	defer jsonFile.Close()
+
+	byteValue, _ := io.ReadAll(jsonFile)
+	var result map[string]string
+	json.Unmarshal([]byte(byteValue), &result)
+	return result
+}

rolling-shutter/medley/validatorregistry/validatorregistry.go

@@ -33,8 +33,8 @@ func (m *AggregateRegistrationMessage) Marshal() []byte {
 	b = binary.BigEndian.AppendUint64(b, m.ChainID)
 	b = append(b, m.ValidatorRegistryAddress.Bytes()...)
 	b = binary.BigEndian.AppendUint64(b, m.ValidatorIndex)
-	b = binary.BigEndian.AppendUint32(b, m.Nonce)
 	b = binary.BigEndian.AppendUint32(b, m.Count)
+	b = binary.BigEndian.AppendUint32(b, m.Nonce)
 	if m.IsRegistration {
 		b = append(b, 1)
 	} else {
@@ -53,8 +53,8 @@ func (m *AggregateRegistrationMessage) Unmarshal(b []byte) error {
 	m.ChainID = binary.BigEndian.Uint64(b[1:9])
 	m.ValidatorRegistryAddress = common.BytesToAddress(b[9:29])
 	m.ValidatorIndex = binary.BigEndian.Uint64(b[29:37])
-	m.Nonce = binary.BigEndian.Uint32(b[37:41])
-	m.Count = binary.BigEndian.Uint32(b[41:45])
+	m.Count = binary.BigEndian.Uint32(b[37:41])
+	m.Nonce = binary.BigEndian.Uint32(b[41:45])
 	switch b[45] {
 	case 0:
 		m.IsRegistration = false

testdata/signedRegistrations.json

@@ -0,0 +1 @@
+{"message":"0x0100000000000027d8a9289a3dd14febe10611119be81e5d35eaac30840000000000000000000001f40000000001","signature":"0x941698fb21c716ac4b9eae341c2eb63cbafb1206e1382986130ca06a3879a5f6a111a582f95233517abef65aac9e4a1912ea81b5b7584635ea3773969c9af747f6cc5d5c1e2aa628b6779fa56c02f6147a151ca46677b53bc03cbba1a9a079ed"}