cleanup

cluster/lock.go

@@ -123,6 +123,24 @@ func (l Lock) SetLockHash() (Lock, error) {
 	return l, nil
 }
 
+// VerifyHashes returns an error if hashes populated from json object doesn't matches actual hashes.
+func (l Lock) VerifyHashes() error {
+	if err := l.Definition.VerifyHashes(); err != nil {
+		return errors.Wrap(err, "invalid definition")
+	}
+
+	lockHash, err := hashLock(l)
+	if err != nil {
+		return err
+	}
+
+	if !bytes.Equal(l.LockHash, lockHash[:]) {
+		return errors.New("invalid lock hash")
+	}
+
+	return nil
+}
+
 // VerifySignatures returns true if all config signatures are fully populated and valid.
 // A verified lock is ready for use in charon run.
 func (l Lock) VerifySignatures() error {

cluster/test_cluster.go

@@ -132,6 +132,9 @@ func NewForT(t *testing.T, dv, k, n, seed int, opts ...func(*Definition)) (Lock,
 			def.Operators[i], err = signOperator(p2pKeys[i], def, def.Operators[i])
 			require.NoError(t, err)
 		}
+
+		def, err = def.SetDefinitionHashes()
+		require.NoError(t, err)
 	}
 
 	lock := Lock{

cluster/test_cluster_test.go

@@ -0,0 +1,30 @@
+// Copyright © 2022 Obol Labs Inc.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation, either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package cluster_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/obolnetwork/charon/cluster"
+)
+
+func TestNewCluster(t *testing.T) {
+	lock, _, _ := cluster.NewForT(t, 3, 3, 3, 0)
+	require.NoError(t, lock.VerifyHashes())
+	require.NoError(t, lock.VerifySignatures())
+}