Merge pull request #3305 from vegaprotocol/feature/fix-gql-api-proposal

fix governance validation of proposal terms

governance/service.go

@@ -18,7 +18,8 @@ import (
 const invalidProposalTerms = "invalid proposal terms"
 
 var (
-	ErrMissingVoteData = errors.New("required fields from vote missing")
+	ErrMissingVoteData          = errors.New("required fields from vote missing")
+	ErrUnsupportedProposalTerms = errors.New("unsupported proposal terms")
 )
 
 //go:generate go run github.com/golang/mock/mockgen -destination mocks/event_bus_mock.go -package mocks code.vegaprotocol.io/vega/governance EventBus
@@ -380,8 +381,10 @@ func (s *Svc) validateProposalChanges(terms *types.ProposalTerms) error {
 		return s.validateNewMarketChanges(terms, c.NewMarket)
 	case *types.ProposalTerms_UpdateNetworkParameter:
 		return s.validateUpdateNetworkParameterChanges(c.UpdateNetworkParameter)
+	case *types.ProposalTerms_NewAsset:
+		return s.validateNewAssetChanges(c.NewAsset)
 	default:
-		return nil
+		return ErrUnsupportedProposalTerms
 	}
 }
 
@@ -390,6 +393,11 @@ func (s *Svc) validateUpdateNetworkParameterChanges(np *types.UpdateNetworkParam
 	return
 }
 
+func (s *Svc) validateNewAssetChanges(np *types.NewAsset) (err error) {
+	_, err = validateNewAsset(np.Changes)
+	return
+}
+
 func (s *Svc) validateNewMarketChanges(
 	terms *types.ProposalTerms, nm *types.NewMarket) (err error) {
 	closeTime := time.Unix(terms.ClosingTimestamp, 0)

governance/service_test.go

@@ -55,6 +55,7 @@ func TestPrepareUpdateNetworkParameterProposal(t *testing.T) {
 	t.Run("prepare update network proposal - failure empty key", testPrepareNetworkParameterUpdateProposalFailureEmptyKey)
 	t.Run("prepare update network proposal - failure empty value", testPrepareNetworkParameterUpdateProposalFailureEmptyValue)
 	t.Run("prepare update network proposal - validation failure", testPrepareNetworkParameterUpdateProposalValidationFailure)
+	t.Run("prepare proposal with invalid changes - validation failure", testPrepareProposalWithInvalidChanges)
 }
 
 func testPrepareNetworkParameterUpdateProposalSuccess(t *testing.T) {
@@ -133,6 +134,22 @@ func testPrepareNetworkParameterUpdateProposalFailureEmptyValue(t *testing.T) {
 	assert.Nil(t, proposal)
 }
 
+func testPrepareProposalWithInvalidChanges(t *testing.T) {
+	svc := newTestService(t)
+	defer svc.ctrl.Finish()
+	terms := types.ProposalTerms{
+		ClosingTimestamp:   time.Now().Add(time.Hour * 24 * 2).UTC().Unix(),
+		EnactmentTimestamp: time.Now().Add(time.Hour * 24 * 60).UTC().Unix(),
+		Change:             nil,
+	}
+
+	testAuthor := "test-author"
+	proposal, err := svc.PrepareProposal(svc.ctx, testAuthor, "", &terms)
+
+	assert.EqualError(t, err, governance.ErrUnsupportedProposalTerms.Error())
+	assert.Nil(t, proposal)
+}
+
 func testPrepareNetworkParameterUpdateProposalValidationFailure(t *testing.T) {
 	svc := newTestService(t)
 	defer svc.ctrl.Finish()