-
Notifications
You must be signed in to change notification settings - Fork 3.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: clean-up after go-plugin system pr #15402
Merged
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
317a521
chore: clean-up after go-plugin system pr
julienrbrt 4ace2ac
updates
julienrbrt 820c073
updates
julienrbrt 416e5d1
update confix
julienrbrt a1b364a
Merge branch 'main' into julien/chore-streaming
julienrbrt f720c88
markdownlint
julienrbrt ba8de97
bump dependencies added in go-plugin pr
julienrbrt c354ac1
fix build
julienrbrt 5878870
updates
julienrbrt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -219,7 +219,7 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg | |
for _, abciListener := range app.streamingManager.ABCIListeners { | ||
ctx := app.deliverState.ctx | ||
blockHeight := ctx.BlockHeight() | ||
if err := abciListener.ListenBeginBlock(app.deliverState.ctx, req, res); err != nil { | ||
if err := abciListener.ListenBeginBlock(ctx, req, res); err != nil { | ||
app.logger.Error("BeginBlock listening hook failed", "height", blockHeight, "err", err) | ||
} | ||
} | ||
|
@@ -426,15 +426,13 @@ func (app *BaseApp) DeliverTx(req abci.RequestDeliverTx) abci.ResponseDeliverTx | |
return sdkerrors.ResponseDeliverTxWithEvents(err, gInfo.GasWanted, gInfo.GasUsed, sdk.MarkEventsToIndex(anteEvents, app.indexEvents), app.trace) | ||
} | ||
|
||
res = abci.ResponseDeliverTx{ | ||
return abci.ResponseDeliverTx{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
GasWanted: int64(gInfo.GasWanted), // TODO: Should type accept unsigned ints? | ||
GasUsed: int64(gInfo.GasUsed), // TODO: Should type accept unsigned ints? | ||
Log: result.Log, | ||
Data: result.Data, | ||
Events: sdk.MarkEventsToIndex(result.Events, app.indexEvents), | ||
} | ||
|
||
return res | ||
} | ||
|
||
// Commit implements the ABCI interface. It will commit all state that exists in | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,6 @@ package baseapp | |
|
||
import ( | ||
"fmt" | ||
"os" | ||
"sort" | ||
"strings" | ||
|
||
|
@@ -23,7 +22,7 @@ const ( | |
) | ||
|
||
// RegisterStreamingServices registers streaming services with the BaseApp. | ||
func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, keys map[string]*storetypes.KVStoreKey) { | ||
func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, keys map[string]*storetypes.KVStoreKey) error { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
// register streaming services | ||
streamingCfg := cast.ToStringMap(appOpts.Get(StreamingTomlKey)) | ||
for service := range streamingCfg { | ||
|
@@ -33,15 +32,15 @@ func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, ke | |
logLevel := cast.ToString(appOpts.Get(flags.FlagLogLevel)) | ||
plugin, err := streaming.NewStreamingPlugin(pluginName, logLevel) | ||
if err != nil { | ||
app.logger.Error("failed to load streaming plugin", "error", err) | ||
os.Exit(1) | ||
return fmt.Errorf("failed to load streaming plugin: %w", err) | ||
} | ||
if err := app.registerStreamingPlugin(appOpts, keys, plugin); err != nil { | ||
app.logger.Error("failed to register streaming plugin", "error", err) | ||
os.Exit(1) | ||
return fmt.Errorf("failed to register streaming plugin %w", err) | ||
} | ||
} | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// registerStreamingPlugin registers streaming plugins with the BaseApp. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/cosmos/cosmos-sdk/pull/14207/files#r1136194169