From a9a532e6be67512b3e4e581b5a57a97dff5715ca Mon Sep 17 00:00:00 2001 From: Peter Gilbert Date: Tue, 17 Dec 2019 12:05:31 -0800 Subject: [PATCH] Temporarily disable committee address checks --- go/registry/api/api.go | 6 ++++-- go/registry/tests/tester.go | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go/registry/api/api.go b/go/registry/api/api.go index f21e04d5cac..b9af003bd3c 100644 --- a/go/registry/api/api.go +++ b/go/registry/api/api.go @@ -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. diff --git a/go/registry/tests/tester.go b/go/registry/tests/tester.go index 9f719430dbb..bac24473971 100644 --- a/go/registry/tests/tester.go +++ b/go/registry/tests/tester.go @@ -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")