Skip to content

Commit

Permalink
Temporarily disable committee address checks
Browse files Browse the repository at this point in the history
  • Loading branch information
peterjgilbert committed Dec 17, 2019
1 parent af6600b commit a9a532e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 4 additions & 2 deletions go/registry/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -491,12 +491,14 @@ func VerifyRegisterNodeArgs( // nolint: gocyclo
}
committeeAddressRequired := n.HasRoles(CommitteeAddressRequiredRoles)
if err := verifyAddresses(params, committeeAddressRequired, n.Committee.Addresses); err != nil {
// XXX: Validate committee addresses after existing deployments have cleared up registry.
// https://github.com/oasislabs/oasis-core/issues/2428
addrs, _ := json.Marshal(n.Committee.Addresses)
logger.Error("RegisterNode: missing/invalid committee addresses",
logger.Warn("RegisterNode: missing/invalid committee addresses",
"node", n,
"committee_addrs", addrs,
)
return nil, err
//return nil, err
}

// Validate P2PInfo.
Expand Down
8 changes: 5 additions & 3 deletions go/registry/tests/tester.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,11 @@ func testRegistryEntityNodes( // nolint: gocyclo
require.Equal(err, api.ErrInvalidArgument)
}

err = v.Register(consensus, v.SignedInvalidRegistration2)
require.Error(err, "register committee node without committee addresses")
require.Equal(err, api.ErrInvalidArgument)
// XXX: Validate committee addresses after existing deployments have cleared up registry.
// https://github.com/oasislabs/oasis-core/issues/2428
// err = v.Register(consensus, v.SignedInvalidRegistration2)
// require.Error(err, "register committee node without committee addresses")
// require.Equal(err, api.ErrInvalidArgument)

err = v.Register(consensus, v.SignedInvalidRegistration3)
require.Error(err, "register committee node without committee certificate")
Expand Down

0 comments on commit a9a532e

Please sign in to comment.