From 7ae759fac28499efece4e28ca56c237cb953ded5 Mon Sep 17 00:00:00 2001 From: Khanh Hoa Date: Sat, 12 Oct 2024 13:17:26 +0700 Subject: [PATCH 1/5] chore(server): bump cosmossdk.io/core version and correct comment naming --- server/v2/appmanager/go.mod | 2 +- server/v2/appmanager/go.sum | 4 ++-- server/v2/cometbft/abci.go | 2 +- server/v2/cometbft/internal/mock/mock_reader.go | 2 +- server/v2/stf/branch/mergeiter.go | 8 ++++---- server/v2/stf/core_router_service.go | 2 +- server/v2/stf/gas/defaults.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/v2/appmanager/go.mod b/server/v2/appmanager/go.mod index 110213b868b9..381fca3bdd29 100644 --- a/server/v2/appmanager/go.mod +++ b/server/v2/appmanager/go.mod @@ -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 diff --git a/server/v2/appmanager/go.sum b/server/v2/appmanager/go.sum index e5d225b85b5e..f798f0c9257f 100644 --- a/server/v2/appmanager/go.sum +++ b/server/v2/appmanager/go.sum @@ -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= diff --git a/server/v2/cometbft/abci.go b/server/v2/cometbft/abci.go index 95eeec9bb5da..a1b6be0d5991 100644 --- a/server/v2/cometbft/abci.go +++ b/server/v2/cometbft/abci.go @@ -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 diff --git a/server/v2/cometbft/internal/mock/mock_reader.go b/server/v2/cometbft/internal/mock/mock_reader.go index 7638fc3f115b..9911ee55eb81 100644 --- a/server/v2/cometbft/internal/mock/mock_reader.go +++ b/server/v2/cometbft/internal/mock/mock_reader.go @@ -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. diff --git a/server/v2/stf/branch/mergeiter.go b/server/v2/stf/branch/mergeiter.go index e71b88cffc42..d6c696bbd507 100644 --- a/server/v2/stf/branch/mergeiter.go +++ b/server/v2/stf/branch/mergeiter.go @@ -210,7 +210,7 @@ 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() @@ -218,17 +218,17 @@ func (iter *mergedIterator) skipUntilExistsOrInvalid() bool { 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. return true // cache exists. } } diff --git a/server/v2/stf/core_router_service.go b/server/v2/stf/core_router_service.go index e3a3f95940a6..7506372b8e9d 100644 --- a/server/v2/stf/core_router_service.go +++ b/server/v2/stf/core_router_service.go @@ -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 execute a message and returns a response. func (m queryRouterService) Invoke( ctx context.Context, req transaction.Msg, diff --git a/server/v2/stf/gas/defaults.go b/server/v2/stf/gas/defaults.go index 5b032e81da7e..54d092a83bbb 100644 --- a/server/v2/stf/gas/defaults.go +++ b/server/v2/stf/gas/defaults.go @@ -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, From 95ede134e38513a76450d3666647c66eb507b579 Mon Sep 17 00:00:00 2001 From: Khanh Hoa Date: Sat, 12 Oct 2024 13:54:19 +0700 Subject: [PATCH 2/5] improve comment --- server/v2/stf/core_router_service.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/v2/stf/core_router_service.go b/server/v2/stf/core_router_service.go index 7506372b8e9d..5b94285533a9 100644 --- a/server/v2/stf/core_router_service.go +++ b/server/v2/stf/core_router_service.go @@ -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. func (m msgRouterService) Invoke(ctx context.Context, msg transaction.Msg) (transaction.Msg, error) { exCtx, err := getExecutionCtxFromContext(ctx) if err != nil { @@ -60,7 +60,7 @@ func (m queryRouterService) CanInvoke(ctx context.Context, typeURL string) error return exCtx.queryRouter.CanInvoke(ctx, typeURL) } -// Invoke 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, From f3427c5df7c00a82067cfcdeca984155f1bcff25 Mon Sep 17 00:00:00 2001 From: Khanh Hoa Date: Mon, 14 Oct 2024 07:26:59 +0700 Subject: [PATCH 3/5] bet --- server/v2/stf/branch/mergeiter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/v2/stf/branch/mergeiter.go b/server/v2/stf/branch/mergeiter.go index d6c696bbd507..5728434ecf38 100644 --- a/server/v2/stf/branch/mergeiter.go +++ b/server/v2/stf/branch/mergeiter.go @@ -218,7 +218,7 @@ func (iter *mergedIterator) skipUntilExistsOrInvalid() bool { continue } - // Cache is not a deleted. + // Cache is not a delete. return true // cache exists. case 1: // cache < parent @@ -228,7 +228,7 @@ func (iter *mergedIterator) skipUntilExistsOrInvalid() bool { iter.skipCacheDeletes(keyP) continue } - // Cache is not a deleted. + // Cache is not a delete. return true // cache exists. } } From f1d0acaf901708f9316adb641189a9990a9774a1 Mon Sep 17 00:00:00 2001 From: Khanh Hoa Date: Mon, 14 Oct 2024 07:29:31 +0700 Subject: [PATCH 4/5] bet --- server/v2/stf/branch/mergeiter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/v2/stf/branch/mergeiter.go b/server/v2/stf/branch/mergeiter.go index 5728434ecf38..e71b88cffc42 100644 --- a/server/v2/stf/branch/mergeiter.go +++ b/server/v2/stf/branch/mergeiter.go @@ -210,7 +210,7 @@ func (iter *mergedIterator) skipUntilExistsOrInvalid() bool { return true case 0: // parent == cache. - // Skip over if cache item is a deleted. + // Skip over if cache item is a delete. valueC := iter.cache.Value() if valueC == nil { iter.parent.Next() @@ -222,7 +222,7 @@ func (iter *mergedIterator) skipUntilExistsOrInvalid() bool { return true // cache exists. case 1: // cache < parent - // Skip over if cache item is a deleted. + // Skip over if cache item is a delete. valueC := iter.cache.Value() if valueC == nil { iter.skipCacheDeletes(keyP) From 1ea7b5c27dcf1923f33452dad9bacc0510c7bb6a Mon Sep 17 00:00:00 2001 From: Khanh Hoa Date: Mon, 14 Oct 2024 21:22:17 +0700 Subject: [PATCH 5/5] rollback --- server/v2/stf/core_router_service.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/v2/stf/core_router_service.go b/server/v2/stf/core_router_service.go index 5b94285533a9..7506372b8e9d 100644 --- a/server/v2/stf/core_router_service.go +++ b/server/v2/stf/core_router_service.go @@ -31,7 +31,7 @@ func (m msgRouterService) CanInvoke(ctx context.Context, typeURL string) error { return exCtx.msgRouter.CanInvoke(ctx, typeURL) } -// Invoke executes a query and returns a response. +// Invoke execute a message and returns a response. func (m msgRouterService) Invoke(ctx context.Context, msg transaction.Msg) (transaction.Msg, error) { exCtx, err := getExecutionCtxFromContext(ctx) if err != nil { @@ -60,7 +60,7 @@ func (m queryRouterService) CanInvoke(ctx context.Context, typeURL string) error return exCtx.queryRouter.CanInvoke(ctx, typeURL) } -// Invoke executes a query and returns a response. +// Invoke execute a message and returns a response. func (m queryRouterService) Invoke( ctx context.Context, req transaction.Msg,