[FABG-982] Remove legacy status codes (#91)

Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Jul 3, 2020 · 47216cd · 47216cd
1 parent cef0d99
commit 47216cd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/pkg/common/errors/retry/defaults.go b/pkg/common/errors/retry/defaults.go
@@ -70,8 +70,6 @@ var DefaultResMgmtOpts = Opts{
 var DefaultRetryableCodes = map[status.Group][]status.Code{
 	status.EndorserClientStatus: {
 		status.EndorsementMismatch,
-		status.PrematureChaincodeExecution,
-		status.ChaincodeAlreadyLaunching,
 		status.ChaincodeNameNotFound,
 	},
 	status.EndorserServerStatus: {
@@ -100,8 +98,6 @@ var DefaultRetryableCodes = map[status.Group][]status.Code{
 var ResMgmtDefaultRetryableCodes = map[status.Group][]status.Code{
 	status.EndorserClientStatus: {
 		status.EndorsementMismatch,
-		status.PrematureChaincodeExecution,
-		status.ChaincodeAlreadyLaunching,
 		status.ChaincodeNameNotFound,
 	},
 	status.EndorserServerStatus: {
@@ -132,9 +128,7 @@ var ResMgmtDefaultRetryableCodes = map[status.Group][]status.Code{
 var ChannelClientRetryableCodes = map[status.Group][]status.Code{
 	status.EndorserClientStatus: {
 		status.ConnectionFailed, status.EndorsementMismatch,
-		status.PrematureChaincodeExecution,
 		status.Code(pb.TxValidationCode_MVCC_READ_CONFLICT),
-		status.ChaincodeAlreadyLaunching,
 		status.ChaincodeNameNotFound,
 	},
 	status.EndorserServerStatus: {
@@ -177,8 +171,6 @@ var TestRetryableCodes = map[status.Group][]status.Code{
 	},
 	status.EndorserClientStatus: {
 		status.ConnectionFailed, status.EndorsementMismatch,
-		status.PrematureChaincodeExecution,
-		status.ChaincodeAlreadyLaunching,
 		status.ChaincodeNameNotFound,
 		status.Code(pb.TxValidationCode_MVCC_READ_CONFLICT),
 	},

diff --git a/pkg/common/errors/status/codes.go b/pkg/common/errors/status/codes.go
@@ -55,13 +55,6 @@ const (
 	// GenericTransient is generally used by tests to indicate that a retry is possible
 	GenericTransient Code = 12
 
-	// PrematureChaincodeExecution indicates that an attempt was made to invoke a chaincode that's
-	// in the process of being launched.
-	PrematureChaincodeExecution Code = 21
-
-	// ChaincodeAlreadyLaunching indicates that an attempt for multiple simultaneous invokes was made to launch chaincode
-	ChaincodeAlreadyLaunching Code = 22
-
 	// ChaincodeNameNotFound indicates that an that an attempt was made to invoke a chaincode that's not yet initialized
 	ChaincodeNameNotFound Code = 23
 )
@@ -80,8 +73,6 @@ var CodeName = map[int32]string{
 	9:  "MISSING_ENDORSEMENT",
 	11: "QUERY_ENDORSERS",
 	12: "GENERIC_TRANSIENT",
-	21: "PREMATURE_CHAINCODE_EXECUTION",
-	22: "CHAINCODE_ALREADY_LAUNCHING",
 	23: "CHAINCODE_NAME_NOT_FOUND",
 }