fix merge errors

ava-labs · Aug 23, 2024 · 108bd24 · 108bd24
1 parent d4d2610
commit 108bd24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/vms/platformvm/service_test.go b/vms/platformvm/service_test.go
@@ -642,7 +642,7 @@ func TestGetCurrentValidators(t *testing.T) {
 		found := false
 		for i := 0; i < len(response.Validators); i++ {
 			gotVdr := response.Validators[i].(pchainapi.PermissionlessValidator)
-			if gotVdr.NodeID.Compare(vdr.NodeID.NodeID()) != 0 {
+			if gotVdr.NodeID.Compare(nodeID) != 0 {
 				continue
 			}
 

diff --git a/vms/platformvm/validator_set_property_test.go b/vms/platformvm/validator_set_property_test.go
@@ -686,7 +686,7 @@ func buildVM(t *testing.T) (*VM, ids.ID, error) {
 		chainDB,
 		genesistest.NewBytes(t, genesistest.Config{
 			NodeIDs: []ids.NodeID{
-				genesistest.DefaultNodeIDs[len(genesistest.DefaultNodeIDs)-1],
+				genesistest.DefaultNodeIDs[len(genesistest.DefaultNodeIDs)-1].NodeID(),
 			},
 			ValidatorEndTime: mockable.MaxTime,
 		}),