Rework abort handling to not be dependent on extracting codes from de…

…livertx errors (#465)

## Describe your changes and provide context
This should appropriately allow for cases where panics are recovered and
swallowed earlier because we now simply use the panic to abort
execution, and detect that an abort occurred by reading the abort
channel as the source of truth

## Testing performed to validate your change
Scheduler tests, and need to test alongside atlantic-2

Co-authored-by: Steven Landers <[email protected]>

tasks/scheduler.go

@@ -11,7 +11,6 @@ import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/occ"
 	"github.com/cosmos/cosmos-sdk/utils/tracing"
 	"github.com/tendermint/tendermint/abci/types"
@@ -516,21 +515,14 @@ func (s *scheduler) executeTask(task *deliverTxTask) {
 	s.prepareTask(task)
 
 	resp := s.deliverTx(task.Ctx, task.Request)
-
-	// if an abort occurred, we want to handle that at this level
-	if resp.Codespace == errors.ErrOCCAbort.Codespace() && resp.Code == errors.ErrOCCAbort.ABCICode() {
-		// close the abort channel
-		close(task.AbortCh)
-
+	// close the abort channel
+	close(task.AbortCh)
+	abort, ok := <-task.AbortCh
+	if ok {
+		// if there is an abort item that means we need to wait on the dependent tx
 		task.SetStatus(statusAborted)
-		// read the first abort from the channel
-		abort, ok := <-task.AbortCh
-		if ok {
-			// if there is an abort item that means we need to wait on the dependent tx
-			task.SetStatus(statusAborted)
-			task.Abort = &abort
-			task.AppendDependencies([]int{abort.DependentTxIdx})
-		}
+		task.Abort = &abort
+		task.AppendDependencies([]int{abort.DependentTxIdx})
 		// write from version store to multiversion stores
 		for _, v := range task.VersionStores {
 			v.WriteEstimatesToMultiVersionStore()

tasks/scheduler_test.go

@@ -21,7 +21,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/cachemulti"
 	"github.com/cosmos/cosmos-sdk/store/dbadapter"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/occ"
 	"github.com/cosmos/cosmos-sdk/utils/tracing"
 )
@@ -50,8 +49,7 @@ func abortRecoveryFunc(response *types.ResponseDeliverTx) {
 		if !ok {
 			panic(r)
 		}
-		response.Code = sdkerrors.ErrOCCAbort.ABCICode()
-		response.Codespace = sdkerrors.ErrOCCAbort.Codespace()
+		// empty code and codespace
 		response.Info = "occ abort"
 	}
 }