added BlockDataGet (#14)

celenium-io · Oct 31, 2023 · 08d1918 · 08d1918
1 parent 63e3afb
commit 08d1918
Show file tree

Hide file tree

Showing 24 changed files with 61 additions and 62 deletions.
diff --git a/internal/storage/mock/address.go b/internal/storage/mock/address.go
diff --git a/internal/storage/mock/balance.go b/internal/storage/mock/balance.go
diff --git a/internal/storage/mock/block.go b/internal/storage/mock/block.go
diff --git a/internal/storage/mock/block_stats.go b/internal/storage/mock/block_stats.go
diff --git a/internal/storage/mock/constant.go b/internal/storage/mock/constant.go
diff --git a/internal/storage/mock/denom_metadata.go b/internal/storage/mock/denom_metadata.go
diff --git a/internal/storage/mock/event.go b/internal/storage/mock/event.go
diff --git a/internal/storage/mock/generic.go b/internal/storage/mock/generic.go
diff --git a/internal/storage/mock/message.go b/internal/storage/mock/message.go
diff --git a/internal/storage/mock/namespace.go b/internal/storage/mock/namespace.go
diff --git a/internal/storage/mock/state.go b/internal/storage/mock/state.go
diff --git a/internal/storage/mock/stats.go b/internal/storage/mock/stats.go
diff --git a/internal/storage/mock/tx.go b/internal/storage/mock/tx.go
diff --git a/internal/storage/mock/validator.go b/internal/storage/mock/validator.go
diff --git a/internal/storage/types/event_type_enum.go b/internal/storage/types/event_type_enum.go
diff --git a/internal/storage/types/module_enum.go b/internal/storage/types/module_enum.go
diff --git a/internal/storage/types/msg_address_type_enum.go b/internal/storage/types/msg_address_type_enum.go
diff --git a/internal/storage/types/msg_type_enum.go b/internal/storage/types/msg_type_enum.go
diff --git a/internal/storage/types/status_enum.go b/internal/storage/types/status_enum.go
diff --git a/pkg/indexer/receiver/sync_test.go b/pkg/indexer/receiver/sync_test.go
@@ -83,7 +83,8 @@ func (s *ModuleTestSuite) TestModule_SyncReadsBlocks() {
 
 		for i := types.Level(1); i <= blockCount; i++ {
 			s.api.EXPECT().
-				BlockData(gomock.Any(), i).
+				// BlockData(gomock.Any(), i).
+				BlockDataGet(gomock.Any(), i).
 				Return(types.BlockData{
 					ResultBlock:        getResultBlock(i),
 					ResultBlockResults: getResultBlockResults(i),

diff --git a/pkg/indexer/receiver/worker.go b/pkg/indexer/receiver/worker.go
@@ -24,7 +24,7 @@ func (r *Module) worker(ctx context.Context, level types.Level) {
 		default:
 		}
 
-		block, err := r.api.BlockData(ctx, level)
+		block, err := r.api.BlockDataGet(ctx, level)
 		if err != nil {
 			if errors.Is(err, context.Canceled) {
 				return

diff --git a/pkg/node/api.go b/pkg/node/api.go
@@ -19,6 +19,7 @@ type Api interface {
 	BlockResults(ctx context.Context, level pkgTypes.Level) (pkgTypes.ResultBlockResults, error)
 	Genesis(ctx context.Context) (types.Genesis, error)
 	BlockData(ctx context.Context, level pkgTypes.Level) (pkgTypes.BlockData, error)
+	BlockDataGet(ctx context.Context, level pkgTypes.Level) (pkgTypes.BlockData, error)
 }
 
 //go:generate mockgen -source=$GOFILE -destination=mock/$GOFILE -package=mock -typed

diff --git a/pkg/node/mock/api.go b/pkg/node/mock/api.go
diff --git a/pkg/node/rpc/block.go b/pkg/node/rpc/block.go
@@ -79,3 +79,21 @@ func (api *API) BlockData(ctx context.Context, level pkgTypes.Level) (pkgTypes.B
 	blockData.ResultBlockResults = results.Result
 	return blockData, nil
 }
+
+func (api *API) BlockDataGet(ctx context.Context, level pkgTypes.Level) (pkgTypes.BlockData, error) {
+	var blockData pkgTypes.BlockData
+
+	block, err := api.Block(ctx, level)
+	if err != nil {
+		return blockData, errors.Wrapf(types.ErrRequest, "request error: %s", err.Error())
+	}
+
+	results, err := api.BlockResults(ctx, level)
+	if err != nil {
+		return blockData, errors.Wrapf(types.ErrRequest, "request error: %s", err.Error())
+	}
+
+	blockData.ResultBlock = block
+	blockData.ResultBlockResults = results
+	return blockData, nil
+}