From 0e4a762d39e627a1bd76c7ec156fc0960244b376 Mon Sep 17 00:00:00 2001 From: iuwqyir Date: Wed, 26 Feb 2025 11:51:11 +0200 Subject: [PATCH] rename block fields in api --- internal/common/block.go | 12 ++++++------ internal/handlers/search_handlers_test.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/common/block.go b/internal/common/block.go index 1edf18b..c987792 100644 --- a/internal/common/block.go +++ b/internal/common/block.go @@ -35,10 +35,10 @@ type Block struct { // BlockModel represents a simplified Block structure for Swagger documentation type BlockModel struct { ChainId string `json:"chain_id"` - Number uint64 `json:"number"` - Hash string `json:"hash"` + BlockNumber uint64 `json:"block_number"` + BlockHash string `json:"block_hash"` ParentHash string `json:"parent_hash"` - Timestamp uint64 `json:"timestamp"` + BlockTimestamp uint64 `json:"block_timestamp"` Nonce string `json:"nonce"` Sha3Uncles string `json:"sha3_uncles"` MixHash string `json:"mix_hash"` @@ -76,10 +76,10 @@ type RawBlock = map[string]interface{} func (b *Block) Serialize() BlockModel { return BlockModel{ ChainId: b.ChainId.String(), - Number: b.Number.Uint64(), - Hash: b.Hash, + BlockNumber: b.Number.Uint64(), + BlockHash: b.Hash, ParentHash: b.ParentHash, - Timestamp: uint64(b.Timestamp.Unix()), + BlockTimestamp: uint64(b.Timestamp.Unix()), Nonce: b.Nonce, Sha3Uncles: b.Sha3Uncles, MixHash: b.MixHash, diff --git a/internal/handlers/search_handlers_test.go b/internal/handlers/search_handlers_test.go index ee57735..2044d5d 100644 --- a/internal/handlers/search_handlers_test.go +++ b/internal/handlers/search_handlers_test.go @@ -59,8 +59,8 @@ func TestSearch_BlockNumber(t *testing.T) { err := json.Unmarshal(w.Body.Bytes(), &response) assert.NoError(t, err) assert.Equal(t, SearchResultTypeBlock, response.Data.Type) - assert.Equal(t, blockNumber.Uint64(), response.Data.Blocks[0].Number) - assert.Equal(t, "0xabc", response.Data.Blocks[0].Hash) + assert.Equal(t, blockNumber.Uint64(), response.Data.Blocks[0].BlockNumber) + assert.Equal(t, "0xabc", response.Data.Blocks[0].BlockHash) mockStorage.AssertExpectations(t) }