01832e6239
## Description We decided to remove middlewares, and revert to antehandlers (exactly like in v045) for this release. A better middleware solution will be implemented after v046. ref: #11955 Because this refactor is big, so I decided to cut it into two. This PR is part 1 of 2: - part 1: Revert baseapp and middlewares to v0.45.4 - part 2: Add posthandler, tips, priority --- Suggestion for reviewers: This PR might still be hard to review though. I think it's easier to actually review the diff between v0.45.4 and this PR: - `git difftool -d v0.45.4..am/revert-045-baseapp baseapp` - most important parts to review: runTx, runMsgs - `git difftool -d v0.45.4..am/revert-045-baseapp x/auth/ante` - only cosmetic changes - `git difftool -d v0.45.4..am/revert-045-baseapp simapp` --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
65 lines
1.7 KiB
Go
65 lines
1.7 KiB
Go
package baseapp
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// Test that recovery chain produces expected error at specific middleware layer
|
|
func TestRecoveryChain(t *testing.T) {
|
|
createError := func(id int) error {
|
|
return fmt.Errorf("error from id: %d", id)
|
|
}
|
|
|
|
createHandler := func(id int, handle bool) RecoveryHandler {
|
|
return func(_ interface{}) error {
|
|
if handle {
|
|
return createError(id)
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// check recovery chain [1] -> 2 -> 3
|
|
{
|
|
mw := newRecoveryMiddleware(createHandler(3, false), nil)
|
|
mw = newRecoveryMiddleware(createHandler(2, false), mw)
|
|
mw = newRecoveryMiddleware(createHandler(1, true), mw)
|
|
receivedErr := processRecovery(nil, mw)
|
|
|
|
require.Equal(t, createError(1), receivedErr)
|
|
}
|
|
|
|
// check recovery chain 1 -> [2] -> 3
|
|
{
|
|
mw := newRecoveryMiddleware(createHandler(3, false), nil)
|
|
mw = newRecoveryMiddleware(createHandler(2, true), mw)
|
|
mw = newRecoveryMiddleware(createHandler(1, false), mw)
|
|
receivedErr := processRecovery(nil, mw)
|
|
|
|
require.Equal(t, createError(2), receivedErr)
|
|
}
|
|
|
|
// check recovery chain 1 -> 2 -> [3]
|
|
{
|
|
mw := newRecoveryMiddleware(createHandler(3, true), nil)
|
|
mw = newRecoveryMiddleware(createHandler(2, false), mw)
|
|
mw = newRecoveryMiddleware(createHandler(1, false), mw)
|
|
receivedErr := processRecovery(nil, mw)
|
|
|
|
require.Equal(t, createError(3), receivedErr)
|
|
}
|
|
|
|
// check recovery chain 1 -> 2 -> 3
|
|
{
|
|
mw := newRecoveryMiddleware(createHandler(3, false), nil)
|
|
mw = newRecoveryMiddleware(createHandler(2, false), mw)
|
|
mw = newRecoveryMiddleware(createHandler(1, false), mw)
|
|
receivedErr := processRecovery(nil, mw)
|
|
|
|
require.Nil(t, receivedErr)
|
|
}
|
|
}
|