From 89da86e59fff3dcf63eaf1cf7d14f70a10721026 Mon Sep 17 00:00:00 2001 From: andrew-coleman Date: Mon, 1 Nov 2021 13:44:02 +0000 Subject: [PATCH] Reword duplicate error message There are two error paths that produce the same message. Reword the second one to a more acurate description of the problem. Signed-off-by: andrew-coleman --- internal/pkg/gateway/api.go | 2 +- internal/pkg/gateway/api_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/pkg/gateway/api.go b/internal/pkg/gateway/api.go index b1c2aeeb19b..f9396eff9dc 100644 --- a/internal/pkg/gateway/api.go +++ b/internal/pkg/gateway/api.go @@ -258,7 +258,7 @@ func (gs *Server) Endorse(ctx context.Context, request *gp.EndorseRequest) (*gp. } if endorsements == nil { - return nil, rpcError(codes.Aborted, "failed to endorse transaction, see attached details for more info", errorDetails...) + return nil, rpcError(codes.Aborted, "failed to collect enough transaction endorsements, see attached details for more info", errorDetails...) } env, err := protoutil.CreateTx(proposal, endorsements...) diff --git a/internal/pkg/gateway/api_test.go b/internal/pkg/gateway/api_test.go index 7a4161ca780..dc1d56b7596 100644 --- a/internal/pkg/gateway/api_test.go +++ b/internal/pkg/gateway/api_test.go @@ -569,7 +569,7 @@ func TestEndorse(t *testing.T) { peer3Mock.client.(*mocks.EndorserClient).ProcessProposalReturns(nil, status.Error(codes.Aborted, "bad peer3 endorser")) peer4Mock.client.(*mocks.EndorserClient).ProcessProposalReturns(nil, status.Error(codes.Aborted, "bad peer4 endorser")) }, - errString: "rpc error: code = Aborted desc = failed to endorse transaction, see attached details for more info", + errString: "rpc error: code = Aborted desc = failed to collect enough transaction endorsements, see attached details for more info", errDetails: []*pb.ErrorDetail{ {Address: "peer2:9051", MspId: "msp2", Message: "rpc error: code = Aborted desc = bad peer2 endorser"}, {Address: "peer3:10051", MspId: "msp2", Message: "rpc error: code = Aborted desc = bad peer3 endorser"}, @@ -757,7 +757,7 @@ func TestEndorse(t *testing.T) { postSetup: func(t *testing.T, def *preparedTest) { def.localEndorser.ProcessProposalReturns(createProposalResponse(t, localhostMock.address, "all_good", 200, ""), nil) }, - errString: "rpc error: code = Aborted desc = failed to endorse transaction, see attached details for more info", + errString: "rpc error: code = Aborted desc = failed to collect enough transaction endorsements, see attached details for more info", errDetails: []*pb.ErrorDetail{{ Address: "peer4:11051", MspId: "msp3", @@ -800,7 +800,7 @@ func TestEndorse(t *testing.T) { postSetup: func(t *testing.T, def *preparedTest) { def.localEndorser.ProcessProposalReturns(createProposalResponse(t, localhostMock.address, "all_good", 200, ""), nil) }, - errString: "rpc error: code = Aborted desc = failed to endorse transaction, see attached details for more info", + errString: "rpc error: code = Aborted desc = failed to collect enough transaction endorsements, see attached details for more info", errDetails: []*pb.ErrorDetail{{ Address: "peer4:11051", MspId: "msp3",