Skip to content
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(server): bump cosmossdk.io/core and correct comment naming #22245

Merged
merged 9 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/v2/appmanager/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module cosmossdk.io/server/v2/appmanager

go 1.23

require cosmossdk.io/core v1.0.0-alpha.3
require cosmossdk.io/core v1.0.0-alpha.4

require cosmossdk.io/schema v0.3.0 // indirect
4 changes: 2 additions & 2 deletions server/v2/appmanager/go.sum
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cosmossdk.io/core v1.0.0-alpha.3 h1:pnxaYAas7llXgVz1lM7X6De74nWrhNKnB3yMKe4OUUA=
cosmossdk.io/core v1.0.0-alpha.3/go.mod h1:3u9cWq1FAVtiiCrDPpo4LhR+9V6k/ycSG4/Y/tREWCY=
cosmossdk.io/core v1.0.0-alpha.4 h1:9iuroT9ejDYETCsGkzkvs/wAY/5UFl7nCIINFRxyMJY=
cosmossdk.io/core v1.0.0-alpha.4/go.mod h1:3u9cWq1FAVtiiCrDPpo4LhR+9V6k/ycSG4/Y/tREWCY=
cosmossdk.io/schema v0.3.0 h1:01lcaM4trhzZ1HQTfTV8z6Ma1GziOZ/YmdzBN3F720c=
cosmossdk.io/schema v0.3.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
2 changes: 1 addition & 1 deletion server/v2/cometbft/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func (c *Consensus[T]) Query(ctx context.Context, req *abciproto.QueryRequest) (
}

func (c *Consensus[T]) maybeRunGRPCQuery(ctx context.Context, req *abci.QueryRequest) (resp *abciproto.QueryResponse, isGRPC bool, err error) {
// if this fails then we cannot serve queries anymore
// if this fails then we cannot serve queries anymore
registry, err := c.getProtoRegistry()
if err != nil {
return nil, false, err
Expand Down
2 changes: 1 addition & 1 deletion server/v2/cometbft/internal/mock/mock_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (roa *ReaderMap) GetReader(actor []byte) (corestore.Reader, error) {
return NewMockReader(roa.version, roa.store, actor), nil
}

// Reader represents a read-only adapter for accessing data from the root store.
// MockReader represents a read-only adapter for accessing data from the root store.
type MockReader struct {
version uint64 // The version of the data.
store *MockStore // The root store to read data from.
Expand Down
8 changes: 4 additions & 4 deletions server/v2/stf/branch/mergeiter.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,25 +210,25 @@ func (iter *mergedIterator) skipUntilExistsOrInvalid() bool {
return true

case 0: // parent == cache.
// Skip over if cache item is a delete.
// Skip over if cache item is a deleted.
valueC := iter.cache.Value()
if valueC == nil {
iter.parent.Next()
iter.cache.Next()

continue
}
// Cache is not a delete.
// Cache is not a deleted.

return true // cache exists.
case 1: // cache < parent
// Skip over if cache item is a delete.
// Skip over if cache item is a deleted.
valueC := iter.cache.Value()
if valueC == nil {
iter.skipCacheDeletes(keyP)
continue
}
// Cache is not a delete.
// Cache is not a deleted.
hoank101 marked this conversation as resolved.
Show resolved Hide resolved
return true // cache exists.
}
}
Expand Down
4 changes: 2 additions & 2 deletions server/v2/stf/core_router_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func (m msgRouterService) CanInvoke(ctx context.Context, typeURL string) error {
return exCtx.msgRouter.CanInvoke(ctx, typeURL)
}

// Invoke execute a message and returns a response.
// Invoke executes a query and returns a response.
hoank101 marked this conversation as resolved.
Show resolved Hide resolved
func (m msgRouterService) Invoke(ctx context.Context, msg transaction.Msg) (transaction.Msg, error) {
exCtx, err := getExecutionCtxFromContext(ctx)
if err != nil {
Expand Down Expand Up @@ -60,7 +60,7 @@ func (m queryRouterService) CanInvoke(ctx context.Context, typeURL string) error
return exCtx.queryRouter.CanInvoke(ctx, typeURL)
}

// InvokeUntyped execute a message and returns a response.
// Invoke executes a query and returns a response.
func (m queryRouterService) Invoke(
ctx context.Context,
req transaction.Msg,
Expand Down
2 changes: 1 addition & 1 deletion server/v2/stf/gas/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func DefaultGasMeter(gasLimit uint64) coregas.Meter {
return NewMeter(gasLimit)
}

// DefaultGasConfig returns the default gas config.
// DefaultConfig returns the default gas config.
// Unless overridden, the default gas costs are:
var DefaultConfig = coregas.GasConfig{
HasCost: 1000,
Expand Down
Loading