From 68ee15208d5be125e47cfd4f464d1b449e83b500 Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Tue, 5 Nov 2024 14:47:31 +0200 Subject: [PATCH 1/9] Use channel of pointers to objects for consistency --- access/client.go | 8 +-- access/grpc/client.go | 34 ++++++------ access/grpc/convert/convert.go | 24 ++++----- access/grpc/convert/convert_test.go | 4 +- access/grpc/grpc.go | 84 ++++++++++++++--------------- access/grpc/grpc_test.go | 4 +- access/http/client.go | 8 +-- 7 files changed, 83 insertions(+), 83 deletions(-) diff --git a/access/client.go b/access/client.go index fe0220675..a2e7c09ae 100644 --- a/access/client.go +++ b/access/client.go @@ -115,16 +115,16 @@ type Client interface { GetExecutionDataByBlockID(ctx context.Context, blockID flow.Identifier) (*flow.ExecutionData, error) // SubscribeExecutionDataByBlockID subscribes to execution data updates starting at the given block ID. - SubscribeExecutionDataByBlockID(ctx context.Context, startBlockID flow.Identifier) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) + SubscribeExecutionDataByBlockID(ctx context.Context, startBlockID flow.Identifier) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) // SubscribeExecutionDataByBlockHeight subscribes to execution data updates starting at the given block height. - SubscribeExecutionDataByBlockHeight(ctx context.Context, startHeight uint64) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) + SubscribeExecutionDataByBlockHeight(ctx context.Context, startHeight uint64) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) // SubscribeEventsByBlockID subscribes to events starting at the given block ID. - SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) + SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) // SubscribeEventsByBlockHeight subscribes to events starting at the given block height. - SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) + SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) // Close stops the client connection to the access node. Close() error diff --git a/access/grpc/client.go b/access/grpc/client.go index c9d308dfb..1e4a582a7 100644 --- a/access/grpc/client.go +++ b/access/grpc/client.go @@ -207,7 +207,7 @@ func (c *Client) GetTransactionResultsByBlockID(ctx context.Context, blockID flo func (c *Client) SendAndSubscribeTransactionStatuses( ctx context.Context, tx flow.Transaction, -) (<-chan flow.TransactionResult, <-chan error, error) { +) (<-chan *flow.TransactionResult, <-chan error, error) { return c.grpc.SendAndSubscribeTransactionStatuses(ctx, tx) } @@ -298,14 +298,14 @@ func (c *Client) GetExecutionDataByBlockID(ctx context.Context, blockID flow.Ide func (c *Client) SubscribeExecutionDataByBlockID( ctx context.Context, startBlockID flow.Identifier, -) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { return c.grpc.SubscribeExecutionDataByBlockID(ctx, startBlockID) } func (c *Client) SubscribeExecutionDataByBlockHeight( ctx context.Context, startHeight uint64, -) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { return c.grpc.SubscribeExecutionDataByBlockHeight(ctx, startHeight) } @@ -314,7 +314,7 @@ func (c *Client) SubscribeEventsByBlockID( startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption, -) (<-chan flow.BlockEvents, <-chan error, error) { +) (<-chan *flow.BlockEvents, <-chan error, error) { conf := convertSubscribeOptions(opts...) return c.grpc.SubscribeEventsByBlockID(ctx, startBlockID, filter, WithHeartbeatInterval(conf.heartbeatInterval)) } @@ -324,7 +324,7 @@ func (c *Client) SubscribeEventsByBlockHeight( startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption, -) (<-chan flow.BlockEvents, <-chan error, error) { +) (<-chan *flow.BlockEvents, <-chan error, error) { conf := convertSubscribeOptions(opts...) return c.grpc.SubscribeEventsByBlockHeight(ctx, startHeight, filter, WithHeartbeatInterval(conf.heartbeatInterval)) } @@ -333,7 +333,7 @@ func (c *Client) SubscribeBlockDigestsFromStartBlockID( ctx context.Context, startBlockID flow.Identifier, blockStatus flow.BlockStatus, -) (<-chan flow.BlockDigest, <-chan error, error) { +) (<-chan *flow.BlockDigest, <-chan error, error) { return c.grpc.SubscribeBlockDigestsFromStartBlockID(ctx, startBlockID, blockStatus) } @@ -341,14 +341,14 @@ func (c *Client) SubscribeBlockDigestsFromStartHeight( ctx context.Context, startHeight uint64, blockStatus flow.BlockStatus, -) (<-chan flow.BlockDigest, <-chan error, error) { +) (<-chan *flow.BlockDigest, <-chan error, error) { return c.grpc.SubscribeBlockDigestsFromStartHeight(ctx, startHeight, blockStatus) } func (c *Client) SubscribeBlockDigestsFromLatest( ctx context.Context, blockStatus flow.BlockStatus, -) (<-chan flow.BlockDigest, <-chan error, error) { +) (<-chan *flow.BlockDigest, <-chan error, error) { return c.grpc.SubscribeBlockDigestsFromLatest(ctx, blockStatus) } @@ -356,7 +356,7 @@ func (c *Client) SubscribeBlocksFromStartBlockID( ctx context.Context, startBlockID flow.Identifier, blockStatus flow.BlockStatus, -) (<-chan flow.Block, <-chan error, error) { +) (<-chan *flow.Block, <-chan error, error) { return c.grpc.SubscribeBlocksFromStartBlockID(ctx, startBlockID, blockStatus) } @@ -364,14 +364,14 @@ func (c *Client) SubscribeBlocksFromStartHeight( ctx context.Context, startHeight uint64, blockStatus flow.BlockStatus, -) (<-chan flow.Block, <-chan error, error) { +) (<-chan *flow.Block, <-chan error, error) { return c.grpc.SubscribeBlocksFromStartHeight(ctx, startHeight, blockStatus) } func (c *Client) SubscribeBlocksFromLatest( ctx context.Context, blockStatus flow.BlockStatus, -) (<-chan flow.Block, <-chan error, error) { +) (<-chan *flow.Block, <-chan error, error) { return c.grpc.SubscribeBlocksFromLatest(ctx, blockStatus) } @@ -379,7 +379,7 @@ func (c *Client) SubscribeBlockHeadersFromStartBlockID( ctx context.Context, startBlockID flow.Identifier, blockStatus flow.BlockStatus, -) (<-chan flow.BlockHeader, <-chan error, error) { +) (<-chan *flow.BlockHeader, <-chan error, error) { return c.grpc.SubscribeBlockHeadersFromStartBlockID(ctx, startBlockID, blockStatus) } @@ -387,14 +387,14 @@ func (c *Client) SubscribeBlockHeadersFromStartHeight( ctx context.Context, startHeight uint64, blockStatus flow.BlockStatus, -) (<-chan flow.BlockHeader, <-chan error, error) { +) (<-chan *flow.BlockHeader, <-chan error, error) { return c.grpc.SubscribeBlockHeadersFromStartHeight(ctx, startHeight, blockStatus) } func (c *Client) SubscribeBlocksHeadersFromLatest( ctx context.Context, blockStatus flow.BlockStatus, -) (<-chan flow.BlockHeader, <-chan error, error) { +) (<-chan *flow.BlockHeader, <-chan error, error) { return c.grpc.SubscribeBlockHeadersFromLatest(ctx, blockStatus) } @@ -418,7 +418,7 @@ func (c *Client) SubscribeAccountStatusesFromStartHeight( ctx context.Context, startBlockHeight uint64, filter flow.AccountStatusFilter, -) (<-chan flow.AccountStatus, <-chan error, error) { +) (<-chan *flow.AccountStatus, <-chan error, error) { return c.grpc.SubscribeAccountStatusesFromStartHeight(ctx, startBlockHeight, filter) } @@ -426,13 +426,13 @@ func (c *Client) SubscribeAccountStatusesFromStartBlockID( ctx context.Context, startBlockID flow.Identifier, filter flow.AccountStatusFilter, -) (<-chan flow.AccountStatus, <-chan error, error) { +) (<-chan *flow.AccountStatus, <-chan error, error) { return c.grpc.SubscribeAccountStatusesFromStartBlockID(ctx, startBlockID, filter) } func (c *Client) SubscribeAccountStatusesFromLatestBlock( ctx context.Context, filter flow.AccountStatusFilter, -) (<-chan flow.AccountStatus, <-chan error, error) { +) (<-chan *flow.AccountStatus, <-chan error, error) { return c.grpc.SubscribeAccountStatusesFromLatestBlock(ctx, filter) } diff --git a/access/grpc/convert/convert.go b/access/grpc/convert/convert.go index 5c2ce0ea8..98b17554d 100644 --- a/access/grpc/convert/convert.go +++ b/access/grpc/convert/convert.go @@ -183,7 +183,7 @@ func BlockToMessage(b flow.Block) (*entities.Block, error) { }, nil } -func MessageToBlock(m *entities.Block) (flow.Block, error) { +func MessageToBlock(m *entities.Block) (*flow.Block, error) { var timestamp time.Time var err error @@ -193,7 +193,7 @@ func MessageToBlock(m *entities.Block) (flow.Block, error) { tc, err := MessageToTimeoutCertificate(m.BlockHeader.GetLastViewTc()) if err != nil { - return flow.Block{}, err + return &flow.Block{}, err } header := &flow.BlockHeader{ @@ -214,12 +214,12 @@ func MessageToBlock(m *entities.Block) (flow.Block, error) { guarantees, err := MessagesToCollectionGuarantees(m.GetCollectionGuarantees()) if err != nil { - return flow.Block{}, err + return &flow.Block{}, err } seals, err := MessagesToBlockSeals(m.GetBlockSeals()) if err != nil { - return flow.Block{}, err + return &flow.Block{}, err } payload := &flow.BlockPayload{ @@ -227,7 +227,7 @@ func MessageToBlock(m *entities.Block) (flow.Block, error) { Seals: seals, } - return flow.Block{ + return &flow.Block{ BlockHeader: *header, BlockPayload: *payload, }, nil @@ -257,9 +257,9 @@ func BlockHeaderToMessage(b flow.BlockHeader) (*entities.BlockHeader, error) { }, nil } -func MessageToBlockHeader(m *entities.BlockHeader) (flow.BlockHeader, error) { +func MessageToBlockHeader(m *entities.BlockHeader) (*flow.BlockHeader, error) { if m == nil { - return flow.BlockHeader{}, ErrEmptyMessage + return &flow.BlockHeader{}, ErrEmptyMessage } var timestamp time.Time @@ -270,10 +270,10 @@ func MessageToBlockHeader(m *entities.BlockHeader) (flow.BlockHeader, error) { timeoutCertificate, err := MessageToTimeoutCertificate(m.GetLastViewTc()) if err != nil { - return flow.BlockHeader{}, fmt.Errorf("error converting timeout certificate: %w", err) + return &flow.BlockHeader{}, fmt.Errorf("error converting timeout certificate: %w", err) } - return flow.BlockHeader{ + return &flow.BlockHeader{ ID: flow.HashToID(m.GetId()), ParentID: flow.HashToID(m.GetParentId()), Height: m.GetHeight(), @@ -347,12 +347,12 @@ func QuorumCertificateToMessage(qc flow.QuorumCertificate) (*entities.QuorumCert }, nil } -func MessageToBlockDigest(m *access.SubscribeBlockDigestsResponse) (flow.BlockDigest, error) { +func MessageToBlockDigest(m *access.SubscribeBlockDigestsResponse) (*flow.BlockDigest, error) { if m == nil { - return flow.BlockDigest{}, ErrEmptyMessage + return &flow.BlockDigest{}, ErrEmptyMessage } - return flow.BlockDigest{ + return &flow.BlockDigest{ BlockID: flow.BytesToID(m.GetBlockId()), Height: m.GetBlockHeight(), Timestamp: m.GetBlockTimestamp().AsTime(), diff --git a/access/grpc/convert/convert_test.go b/access/grpc/convert/convert_test.go index 2c255a301..7a8f9f9eb 100644 --- a/access/grpc/convert/convert_test.go +++ b/access/grpc/convert/convert_test.go @@ -61,7 +61,7 @@ func TestConvert_Block(t *testing.T) { blockB, err := MessageToBlock(msg) require.NoError(t, err) - assert.Equal(t, *blockA, blockB) + assert.Equal(t, blockA, blockB) t.Run("Without timestamp", func(t *testing.T) { blockA := test.BlockGenerator().New() @@ -87,7 +87,7 @@ func TestConvert_BlockHeader(t *testing.T) { headerB, err := MessageToBlockHeader(msg) require.NoError(t, err) - assert.Equal(t, headerA, headerB) + assert.Equal(t, headerA, *headerB) t.Run("Without timestamp", func(t *testing.T) { headerA := test.BlockHeaderGenerator().New() diff --git a/access/grpc/grpc.go b/access/grpc/grpc.go index 7e9e9138d..7b761da31 100644 --- a/access/grpc/grpc.go +++ b/access/grpc/grpc.go @@ -245,7 +245,7 @@ func getBlockHeaderResult(res *access.BlockHeaderResponse) (*flow.BlockHeader, e return nil, newMessageToEntityError(entityBlockHeader, err) } header.Status = flow.BlockStatus(res.GetBlockStatus()) - return &header, nil + return header, nil } func (c *BaseClient) GetLatestBlock( @@ -305,7 +305,7 @@ func getBlockResult(res *access.BlockResponse) (*flow.Block, error) { return nil, newMessageToEntityError(entityBlock, err) } block.BlockHeader.Status = flow.BlockStatus(res.GetBlockStatus()) - return &block, nil + return block, nil } func (c *BaseClient) GetCollection( @@ -992,7 +992,7 @@ func (c *BaseClient) SubscribeExecutionDataByBlockID( ctx context.Context, startBlockID flow.Identifier, opts ...grpc.CallOption, -) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { req := executiondata.SubscribeExecutionDataRequest{ StartBlockId: startBlockID[:], EventEncodingVersion: c.eventEncoding, @@ -1004,7 +1004,7 @@ func (c *BaseClient) SubscribeExecutionDataByBlockHeight( ctx context.Context, startHeight uint64, opts ...grpc.CallOption, -) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { req := executiondata.SubscribeExecutionDataRequest{ StartBlockHeight: startHeight, EventEncodingVersion: c.eventEncoding, @@ -1016,13 +1016,13 @@ func (c *BaseClient) subscribeExecutionData( ctx context.Context, req *executiondata.SubscribeExecutionDataRequest, opts ...grpc.CallOption, -) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { stream, err := c.executionDataClient.SubscribeExecutionData(ctx, req, opts...) if err != nil { return nil, nil, err } - sub := make(chan flow.ExecutionDataStreamResponse) + sub := make(chan *flow.ExecutionDataStreamResponse) errChan := make(chan error) sendErr := func(err error) { @@ -1062,7 +1062,7 @@ func (c *BaseClient) subscribeExecutionData( select { case <-ctx.Done(): return - case sub <- response: + case sub <- &response: } } }() @@ -1075,7 +1075,7 @@ func (c *BaseClient) SubscribeEventsByBlockID( startBlockID flow.Identifier, filter flow.EventFilter, opts ...SubscribeOption, -) (<-chan flow.BlockEvents, <-chan error, error) { +) (<-chan *flow.BlockEvents, <-chan error, error) { req := executiondata.SubscribeEventsRequest{ StartBlockId: startBlockID[:], EventEncodingVersion: c.eventEncoding, @@ -1088,7 +1088,7 @@ func (c *BaseClient) SubscribeEventsByBlockHeight( startHeight uint64, filter flow.EventFilter, opts ...SubscribeOption, -) (<-chan flow.BlockEvents, <-chan error, error) { +) (<-chan *flow.BlockEvents, <-chan error, error) { req := executiondata.SubscribeEventsRequest{ StartBlockHeight: startHeight, EventEncodingVersion: c.eventEncoding, @@ -1101,7 +1101,7 @@ func (c *BaseClient) subscribeEvents( req *executiondata.SubscribeEventsRequest, filter flow.EventFilter, opts ...SubscribeOption, -) (<-chan flow.BlockEvents, <-chan error, error) { +) (<-chan *flow.BlockEvents, <-chan error, error) { conf := DefaultSubscribeConfig() for _, apply := range opts { apply(conf) @@ -1119,7 +1119,7 @@ func (c *BaseClient) subscribeEvents( return nil, nil, err } - sub := make(chan flow.BlockEvents) + sub := make(chan *flow.BlockEvents) errChan := make(chan error) sendErr := func(err error) { @@ -1160,7 +1160,7 @@ func (c *BaseClient) subscribeEvents( select { case <-ctx.Done(): return - case sub <- response: + case sub <- &response: } } }() @@ -1173,7 +1173,7 @@ func (c *BaseClient) SubscribeBlocksFromStartBlockID( startBlockID flow.Identifier, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.Block, <-chan error, error) { +) (<-chan *flow.Block, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1189,7 +1189,7 @@ func (c *BaseClient) SubscribeBlocksFromStartBlockID( return nil, nil, newRPCError(err) } - convertBlockResponse := func(response *access.SubscribeBlocksResponse) (flow.Block, error) { + convertBlockResponse := func(response *access.SubscribeBlocksResponse) (*flow.Block, error) { return convert.MessageToBlock(response.GetBlock()) } @@ -1201,7 +1201,7 @@ func (c *BaseClient) SubscribeBlocksFromStartHeight( startHeight uint64, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.Block, <-chan error, error) { +) (<-chan *flow.Block, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1217,7 +1217,7 @@ func (c *BaseClient) SubscribeBlocksFromStartHeight( return nil, nil, newRPCError(err) } - convertBlockResponse := func(response *access.SubscribeBlocksResponse) (flow.Block, error) { + convertBlockResponse := func(response *access.SubscribeBlocksResponse) (*flow.Block, error) { return convert.MessageToBlock(response.GetBlock()) } @@ -1228,7 +1228,7 @@ func (c *BaseClient) SubscribeBlocksFromLatest( ctx context.Context, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.Block, <-chan error, error) { +) (<-chan *flow.Block, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1243,7 +1243,7 @@ func (c *BaseClient) SubscribeBlocksFromLatest( return nil, nil, newRPCError(err) } - convertBlockResponse := func(response *access.SubscribeBlocksResponse) (flow.Block, error) { + convertBlockResponse := func(response *access.SubscribeBlocksResponse) (*flow.Block, error) { return convert.MessageToBlock(response.GetBlock()) } @@ -1254,7 +1254,7 @@ func (c *BaseClient) SendAndSubscribeTransactionStatuses( ctx context.Context, tx flow.Transaction, opts ...grpc.CallOption, -) (<-chan flow.TransactionResult, <-chan error, error) { +) (<-chan *flow.TransactionResult, <-chan error, error) { txMsg, err := convert.TransactionToMessage(tx) if err != nil { return nil, nil, newEntityToMessageError(entityTransaction, err) @@ -1270,7 +1270,7 @@ func (c *BaseClient) SendAndSubscribeTransactionStatuses( return nil, nil, newRPCError(err) } - txStatusChan := make(chan flow.TransactionResult) + txStatusChan := make(chan *flow.TransactionResult) errChan := make(chan error) sendErr := func(err error) { @@ -1313,7 +1313,7 @@ func (c *BaseClient) SendAndSubscribeTransactionStatuses( select { case <-ctx.Done(): return - case txStatusChan <- txResult: + case txStatusChan <- &txResult: } } }() @@ -1326,7 +1326,7 @@ func (c *BaseClient) SubscribeBlockHeadersFromStartBlockID( startBlockID flow.Identifier, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.BlockHeader, <-chan error, error) { +) (<-chan *flow.BlockHeader, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1342,7 +1342,7 @@ func (c *BaseClient) SubscribeBlockHeadersFromStartBlockID( return nil, nil, newRPCError(err) } - convertBlockHeaderResponse := func(response *access.SubscribeBlockHeadersResponse) (flow.BlockHeader, error) { + convertBlockHeaderResponse := func(response *access.SubscribeBlockHeadersResponse) (*flow.BlockHeader, error) { return convert.MessageToBlockHeader(response.GetHeader()) } @@ -1354,7 +1354,7 @@ func (c *BaseClient) SubscribeBlockHeadersFromStartHeight( startHeight uint64, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.BlockHeader, <-chan error, error) { +) (<-chan *flow.BlockHeader, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1370,7 +1370,7 @@ func (c *BaseClient) SubscribeBlockHeadersFromStartHeight( return nil, nil, newRPCError(err) } - convertBlockHeaderResponse := func(response *access.SubscribeBlockHeadersResponse) (flow.BlockHeader, error) { + convertBlockHeaderResponse := func(response *access.SubscribeBlockHeadersResponse) (*flow.BlockHeader, error) { return convert.MessageToBlockHeader(response.GetHeader()) } @@ -1381,7 +1381,7 @@ func (c *BaseClient) SubscribeBlockHeadersFromLatest( ctx context.Context, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.BlockHeader, <-chan error, error) { +) (<-chan *flow.BlockHeader, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1396,7 +1396,7 @@ func (c *BaseClient) SubscribeBlockHeadersFromLatest( return nil, nil, newRPCError(err) } - convertBlockHeaderResponse := func(response *access.SubscribeBlockHeadersResponse) (flow.BlockHeader, error) { + convertBlockHeaderResponse := func(response *access.SubscribeBlockHeadersResponse) (*flow.BlockHeader, error) { return convert.MessageToBlockHeader(response.GetHeader()) } @@ -1408,7 +1408,7 @@ func (c *BaseClient) SubscribeAccountStatusesFromStartHeight( startHeight uint64, filter flow.AccountStatusFilter, opts ...grpc.CallOption, -) (<-chan flow.AccountStatus, <-chan error, error) { +) (<-chan *flow.AccountStatus, <-chan error, error) { request := &executiondata.SubscribeAccountStatusesFromStartHeightRequest{ StartBlockHeight: startHeight, EventEncodingVersion: c.eventEncoding, @@ -1435,7 +1435,7 @@ func (c *BaseClient) SubscribeAccountStatusesFromStartBlockID( startBlockID flow.Identifier, filter flow.AccountStatusFilter, opts ...grpc.CallOption, -) (<-chan flow.AccountStatus, <-chan error, error) { +) (<-chan *flow.AccountStatus, <-chan error, error) { request := &executiondata.SubscribeAccountStatusesFromStartBlockIDRequest{ StartBlockId: startBlockID.Bytes(), EventEncodingVersion: c.eventEncoding, @@ -1461,7 +1461,7 @@ func (c *BaseClient) SubscribeAccountStatusesFromLatestBlock( ctx context.Context, filter flow.AccountStatusFilter, opts ...grpc.CallOption, -) (<-chan flow.AccountStatus, <-chan error, error) { +) (<-chan *flow.AccountStatus, <-chan error, error) { request := &executiondata.SubscribeAccountStatusesFromLatestBlockRequest{ EventEncodingVersion: c.eventEncoding, } @@ -1487,7 +1487,7 @@ func (c *BaseClient) SubscribeBlockDigestsFromStartBlockID( startBlockID flow.Identifier, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.BlockDigest, <-chan error, error) { +) (<-chan *flow.BlockDigest, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1503,7 +1503,7 @@ func (c *BaseClient) SubscribeBlockDigestsFromStartBlockID( return nil, nil, newRPCError(err) } - convertBlockDigestResponse := func(response *access.SubscribeBlockDigestsResponse) (flow.BlockDigest, error) { + convertBlockDigestResponse := func(response *access.SubscribeBlockDigestsResponse) (*flow.BlockDigest, error) { return convert.MessageToBlockDigest(response) } @@ -1515,7 +1515,7 @@ func (c *BaseClient) SubscribeBlockDigestsFromStartHeight( startHeight uint64, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.BlockDigest, <-chan error, error) { +) (<-chan *flow.BlockDigest, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1531,7 +1531,7 @@ func (c *BaseClient) SubscribeBlockDigestsFromStartHeight( return nil, nil, newRPCError(err) } - convertBlockDigestResponse := func(response *access.SubscribeBlockDigestsResponse) (flow.BlockDigest, error) { + convertBlockDigestResponse := func(response *access.SubscribeBlockDigestsResponse) (*flow.BlockDigest, error) { return convert.MessageToBlockDigest(response) } @@ -1542,7 +1542,7 @@ func (c *BaseClient) SubscribeBlockDigestsFromLatest( ctx context.Context, blockStatus flow.BlockStatus, opts ...grpc.CallOption, -) (<-chan flow.BlockDigest, <-chan error, error) { +) (<-chan *flow.BlockDigest, <-chan error, error) { status := convert.BlockStatusToEntity(blockStatus) if status == entities.BlockStatus_BLOCK_UNKNOWN { return nil, nil, newRPCError(errors.New("unknown block status")) @@ -1557,7 +1557,7 @@ func (c *BaseClient) SubscribeBlockDigestsFromLatest( return nil, nil, newRPCError(err) } - convertBlockDigestResponse := func(response *access.SubscribeBlockDigestsResponse) (flow.BlockDigest, error) { + convertBlockDigestResponse := func(response *access.SubscribeBlockDigestsResponse) (*flow.BlockDigest, error) { return convert.MessageToBlockDigest(response) } @@ -1574,9 +1574,9 @@ func (c *BaseClient) SubscribeBlockDigestsFromLatest( func subscribe[Response any, ClientResponse any]( ctx context.Context, receive func() (*ClientResponse, error), - convertResponse func(*ClientResponse) (Response, error), -) (<-chan Response, <-chan error, error) { - subChan := make(chan Response) + convertResponse func(*ClientResponse) (*Response, error), +) (<-chan *Response, <-chan error, error) { + subChan := make(chan *Response) errChan := make(chan error) sendErr := func(err error) { @@ -1632,8 +1632,8 @@ func subscribeContinuouslyIndexed[Response IndexedMessage, ClientResponse any]( ctx context.Context, receive func() (*ClientResponse, error), convertResponse func(*ClientResponse) (Response, error), -) (<-chan Response, <-chan error, error) { - subChan := make(chan Response) +) (<-chan *Response, <-chan error, error) { + subChan := make(chan *Response) errChan := make(chan error) sendErr := func(err error) { @@ -1675,7 +1675,7 @@ func subscribeContinuouslyIndexed[Response IndexedMessage, ClientResponse any]( select { case <-ctx.Done(): return - case subChan <- response: + case subChan <- &response: } } }() diff --git a/access/grpc/grpc_test.go b/access/grpc/grpc_test.go index 7aa83b6df..33e497194 100644 --- a/access/grpc/grpc_test.go +++ b/access/grpc/grpc_test.go @@ -2579,7 +2579,7 @@ func TestClient_SendAndSubscribeTransactionStatuses(t *testing.T) { actualTxResult := <-txResultCh expectedTxResult, err := convert.MessageToTransactionResult(stream.responses[i].GetTransactionResults(), DefaultClientOptions().jsonOptions) require.NoError(t, err) - require.Equal(t, expectedTxResult, actualTxResult) + require.Equal(t, expectedTxResult, *actualTxResult) require.Equal(t, expectedCounter, stream.responses[i].MessageIndex) expectedCounter++ @@ -2613,7 +2613,7 @@ func TestClient_SendAndSubscribeTransactionStatuses(t *testing.T) { actualTxResult := <-txResultCh expectedTxResult, err := convert.MessageToTransactionResult(stream.responses[i].GetTransactionResults(), DefaultClientOptions().jsonOptions) require.NoError(t, err) - require.Equal(t, expectedTxResult, actualTxResult) + require.Equal(t, expectedTxResult, *actualTxResult) require.Equal(t, expectedCounter, stream.responses[i].MessageIndex) expectedCounter++ diff --git a/access/http/client.go b/access/http/client.go index 4e25212bd..b1e170fc0 100644 --- a/access/http/client.go +++ b/access/http/client.go @@ -272,19 +272,19 @@ func (c *Client) GetExecutionDataByBlockID(ctx context.Context, blockID flow.Ide return nil, fmt.Errorf("not implemented") } -func (c *Client) SubscribeExecutionDataByBlockID(ctx context.Context, startBlockID flow.Identifier) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +func (c *Client) SubscribeExecutionDataByBlockID(ctx context.Context, startBlockID flow.Identifier) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { return nil, nil, fmt.Errorf("not implemented") } -func (c *Client) SubscribeExecutionDataByBlockHeight(ctx context.Context, startHeight uint64) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +func (c *Client) SubscribeExecutionDataByBlockHeight(ctx context.Context, startHeight uint64) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { return nil, nil, fmt.Errorf("not implemented") } -func (c *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) { +func (c *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) { return nil, nil, fmt.Errorf("not implemented") } -func (c *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) { +func (c *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) { return nil, nil, fmt.Errorf("not implemented") } From a48b6258eb4725f3e6114d8c8c689c1b0b53663d Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Tue, 5 Nov 2024 14:52:02 +0200 Subject: [PATCH 2/9] generate new mocks --- access/mocks/Client.go | 32 ++++++++++++++++---------------- go.mod | 3 +++ go.sum | 9 +++++++++ 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/access/mocks/Client.go b/access/mocks/Client.go index 7a39bb053..c0faa4eed 100644 --- a/access/mocks/Client.go +++ b/access/mocks/Client.go @@ -613,7 +613,7 @@ func (_m *Client) SendTransaction(ctx context.Context, tx flow.Transaction) erro } // SubscribeEventsByBlockHeight provides a mock function with given fields: ctx, startHeight, filter, opts -func (_m *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) { +func (_m *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -623,12 +623,12 @@ func (_m *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan flow.BlockEvents - if rf, ok := ret.Get(0).(func(context.Context, uint64, flow.EventFilter, ...access.SubscribeOption) <-chan flow.BlockEvents); ok { + var r0 <-chan *flow.BlockEvents + if rf, ok := ret.Get(0).(func(context.Context, uint64, flow.EventFilter, ...access.SubscribeOption) <-chan *flow.BlockEvents); ok { r0 = rf(ctx, startHeight, filter, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan flow.BlockEvents) + r0 = ret.Get(0).(<-chan *flow.BlockEvents) } } @@ -652,7 +652,7 @@ func (_m *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight } // SubscribeEventsByBlockID provides a mock function with given fields: ctx, startBlockID, filter, opts -func (_m *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) { +func (_m *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -662,12 +662,12 @@ func (_m *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flo _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan flow.BlockEvents - if rf, ok := ret.Get(0).(func(context.Context, flow.Identifier, flow.EventFilter, ...access.SubscribeOption) <-chan flow.BlockEvents); ok { + var r0 <-chan *flow.BlockEvents + if rf, ok := ret.Get(0).(func(context.Context, flow.Identifier, flow.EventFilter, ...access.SubscribeOption) <-chan *flow.BlockEvents); ok { r0 = rf(ctx, startBlockID, filter, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan flow.BlockEvents) + r0 = ret.Get(0).(<-chan *flow.BlockEvents) } } @@ -691,15 +691,15 @@ func (_m *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flo } // SubscribeExecutionDataByBlockHeight provides a mock function with given fields: ctx, startHeight -func (_m *Client) SubscribeExecutionDataByBlockHeight(ctx context.Context, startHeight uint64) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +func (_m *Client) SubscribeExecutionDataByBlockHeight(ctx context.Context, startHeight uint64) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { ret := _m.Called(ctx, startHeight) - var r0 <-chan flow.ExecutionDataStreamResponse - if rf, ok := ret.Get(0).(func(context.Context, uint64) <-chan flow.ExecutionDataStreamResponse); ok { + var r0 <-chan *flow.ExecutionDataStreamResponse + if rf, ok := ret.Get(0).(func(context.Context, uint64) <-chan *flow.ExecutionDataStreamResponse); ok { r0 = rf(ctx, startHeight) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan flow.ExecutionDataStreamResponse) + r0 = ret.Get(0).(<-chan *flow.ExecutionDataStreamResponse) } } @@ -723,15 +723,15 @@ func (_m *Client) SubscribeExecutionDataByBlockHeight(ctx context.Context, start } // SubscribeExecutionDataByBlockID provides a mock function with given fields: ctx, startBlockID -func (_m *Client) SubscribeExecutionDataByBlockID(ctx context.Context, startBlockID flow.Identifier) (<-chan flow.ExecutionDataStreamResponse, <-chan error, error) { +func (_m *Client) SubscribeExecutionDataByBlockID(ctx context.Context, startBlockID flow.Identifier) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) { ret := _m.Called(ctx, startBlockID) - var r0 <-chan flow.ExecutionDataStreamResponse - if rf, ok := ret.Get(0).(func(context.Context, flow.Identifier) <-chan flow.ExecutionDataStreamResponse); ok { + var r0 <-chan *flow.ExecutionDataStreamResponse + if rf, ok := ret.Get(0).(func(context.Context, flow.Identifier) <-chan *flow.ExecutionDataStreamResponse); ok { r0 = rf(ctx, startBlockID) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan flow.ExecutionDataStreamResponse) + r0 = ret.Get(0).(<-chan *flow.ExecutionDataStreamResponse) } } diff --git a/go.mod b/go.mod index b7026b947..ffbef5def 100644 --- a/go.mod +++ b/go.mod @@ -67,6 +67,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d // indirect + github.com/vektra/mockery v1.1.2 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/blake3 v0.2.3 // indirect go.opencensus.io v0.24.0 // indirect @@ -79,12 +80,14 @@ require ( golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/go.sum b/go.sum index 96013eaaa..e75c4b8a8 100644 --- a/go.sum +++ b/go.sum @@ -157,10 +157,12 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -171,8 +173,11 @@ github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8 github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c/go.mod h1:JlzghshsemAMDGZLytTFY8C1JQxQPhnatWqNwUXjggo= github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d h1:5JInRQbk5UBX8JfUvKh2oYTLMVwj3p6n+wapDDm7hko= github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d/go.mod h1:Nlx5Y115XQvNcIdIy7dZXaNSUpzwBSge4/Ivk93/Yog= +github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4= +github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= @@ -212,6 +217,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -221,6 +227,7 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -232,6 +239,7 @@ golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5H golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= @@ -266,6 +274,7 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= From dad36b8c90c53d91d8a055777cfd8b0e2410abea Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Tue, 5 Nov 2024 14:54:08 +0200 Subject: [PATCH 3/9] run go mod tidy --- go.mod | 3 --- go.sum | 9 --------- 2 files changed, 12 deletions(-) diff --git a/go.mod b/go.mod index ffbef5def..b7026b947 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,6 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d // indirect - github.com/vektra/mockery v1.1.2 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/blake3 v0.2.3 // indirect go.opencensus.io v0.24.0 // indirect @@ -80,14 +79,12 @@ require ( golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect - golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/go.sum b/go.sum index e75c4b8a8..96013eaaa 100644 --- a/go.sum +++ b/go.sum @@ -157,12 +157,10 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -173,11 +171,8 @@ github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8 github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c/go.mod h1:JlzghshsemAMDGZLytTFY8C1JQxQPhnatWqNwUXjggo= github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d h1:5JInRQbk5UBX8JfUvKh2oYTLMVwj3p6n+wapDDm7hko= github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d/go.mod h1:Nlx5Y115XQvNcIdIy7dZXaNSUpzwBSge4/Ivk93/Yog= -github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4= -github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= @@ -217,7 +212,6 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -227,7 +221,6 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -239,7 +232,6 @@ golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5H golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= @@ -274,7 +266,6 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= From 9acae319349bb0e2296147c5cc990bf9ab797005 Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Tue, 14 Jan 2025 11:51:36 +0200 Subject: [PATCH 4/9] return nil instead of pointer to empty object --- access/grpc/convert/convert.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/access/grpc/convert/convert.go b/access/grpc/convert/convert.go index 98b17554d..047710893 100644 --- a/access/grpc/convert/convert.go +++ b/access/grpc/convert/convert.go @@ -193,7 +193,7 @@ func MessageToBlock(m *entities.Block) (*flow.Block, error) { tc, err := MessageToTimeoutCertificate(m.BlockHeader.GetLastViewTc()) if err != nil { - return &flow.Block{}, err + return nil, err } header := &flow.BlockHeader{ @@ -214,12 +214,12 @@ func MessageToBlock(m *entities.Block) (*flow.Block, error) { guarantees, err := MessagesToCollectionGuarantees(m.GetCollectionGuarantees()) if err != nil { - return &flow.Block{}, err + return nil, err } seals, err := MessagesToBlockSeals(m.GetBlockSeals()) if err != nil { - return &flow.Block{}, err + return nil, err } payload := &flow.BlockPayload{ From d7e3195d08939759e6875209f096da58c83f972d Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Fri, 24 Jan 2025 13:23:21 +0200 Subject: [PATCH 5/9] subscribe events return objects by value --- access/client.go | 4 ++-- access/grpc/client.go | 4 ++-- access/grpc/grpc.go | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/access/client.go b/access/client.go index a2e7c09ae..60c671884 100644 --- a/access/client.go +++ b/access/client.go @@ -121,10 +121,10 @@ type Client interface { SubscribeExecutionDataByBlockHeight(ctx context.Context, startHeight uint64) (<-chan *flow.ExecutionDataStreamResponse, <-chan error, error) // SubscribeEventsByBlockID subscribes to events starting at the given block ID. - SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) + SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) // SubscribeEventsByBlockHeight subscribes to events starting at the given block height. - SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) + SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) // Close stops the client connection to the access node. Close() error diff --git a/access/grpc/client.go b/access/grpc/client.go index 1e4a582a7..e479ad6f5 100644 --- a/access/grpc/client.go +++ b/access/grpc/client.go @@ -314,7 +314,7 @@ func (c *Client) SubscribeEventsByBlockID( startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption, -) (<-chan *flow.BlockEvents, <-chan error, error) { +) (<-chan flow.BlockEvents, <-chan error, error) { conf := convertSubscribeOptions(opts...) return c.grpc.SubscribeEventsByBlockID(ctx, startBlockID, filter, WithHeartbeatInterval(conf.heartbeatInterval)) } @@ -324,7 +324,7 @@ func (c *Client) SubscribeEventsByBlockHeight( startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption, -) (<-chan *flow.BlockEvents, <-chan error, error) { +) (<-chan flow.BlockEvents, <-chan error, error) { conf := convertSubscribeOptions(opts...) return c.grpc.SubscribeEventsByBlockHeight(ctx, startHeight, filter, WithHeartbeatInterval(conf.heartbeatInterval)) } diff --git a/access/grpc/grpc.go b/access/grpc/grpc.go index 071768bb9..ad81a66bb 100644 --- a/access/grpc/grpc.go +++ b/access/grpc/grpc.go @@ -1075,7 +1075,7 @@ func (c *BaseClient) SubscribeEventsByBlockID( startBlockID flow.Identifier, filter flow.EventFilter, opts ...SubscribeOption, -) (<-chan *flow.BlockEvents, <-chan error, error) { +) (<-chan flow.BlockEvents, <-chan error, error) { req := executiondata.SubscribeEventsRequest{ StartBlockId: startBlockID[:], EventEncodingVersion: c.eventEncoding, @@ -1088,7 +1088,7 @@ func (c *BaseClient) SubscribeEventsByBlockHeight( startHeight uint64, filter flow.EventFilter, opts ...SubscribeOption, -) (<-chan *flow.BlockEvents, <-chan error, error) { +) (<-chan flow.BlockEvents, <-chan error, error) { req := executiondata.SubscribeEventsRequest{ StartBlockHeight: startHeight, EventEncodingVersion: c.eventEncoding, @@ -1101,7 +1101,7 @@ func (c *BaseClient) subscribeEvents( req *executiondata.SubscribeEventsRequest, filter flow.EventFilter, opts ...SubscribeOption, -) (<-chan *flow.BlockEvents, <-chan error, error) { +) (<-chan flow.BlockEvents, <-chan error, error) { conf := DefaultSubscribeConfig() for _, apply := range opts { apply(conf) @@ -1119,7 +1119,7 @@ func (c *BaseClient) subscribeEvents( return nil, nil, err } - sub := make(chan *flow.BlockEvents) + sub := make(chan flow.BlockEvents) errChan := make(chan error) sendErr := func(err error) { @@ -1160,7 +1160,7 @@ func (c *BaseClient) subscribeEvents( select { case <-ctx.Done(): return - case sub <- &response: + case sub <- response: } } }() From fa3734764b4659655942afed4372b7237f526fc5 Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Fri, 24 Jan 2025 13:37:29 +0200 Subject: [PATCH 6/9] fix http interfaces --- access/http/client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/access/http/client.go b/access/http/client.go index b1e170fc0..e309a502d 100644 --- a/access/http/client.go +++ b/access/http/client.go @@ -280,11 +280,11 @@ func (c *Client) SubscribeExecutionDataByBlockHeight(ctx context.Context, startH return nil, nil, fmt.Errorf("not implemented") } -func (c *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) { +func (c *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) { return nil, nil, fmt.Errorf("not implemented") } -func (c *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) { +func (c *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) { return nil, nil, fmt.Errorf("not implemented") } From 61c3c93520af9c681a900da0d92d6f12e9925587 Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Fri, 24 Jan 2025 13:41:33 +0200 Subject: [PATCH 7/9] regenerate mocks --- access/mocks/Client.go | 16 ++++++++-------- go.mod | 3 +++ go.sum | 9 +++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/access/mocks/Client.go b/access/mocks/Client.go index c0faa4eed..fbf354409 100644 --- a/access/mocks/Client.go +++ b/access/mocks/Client.go @@ -613,7 +613,7 @@ func (_m *Client) SendTransaction(ctx context.Context, tx flow.Transaction) erro } // SubscribeEventsByBlockHeight provides a mock function with given fields: ctx, startHeight, filter, opts -func (_m *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) { +func (_m *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight uint64, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -623,12 +623,12 @@ func (_m *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan *flow.BlockEvents - if rf, ok := ret.Get(0).(func(context.Context, uint64, flow.EventFilter, ...access.SubscribeOption) <-chan *flow.BlockEvents); ok { + var r0 <-chan flow.BlockEvents + if rf, ok := ret.Get(0).(func(context.Context, uint64, flow.EventFilter, ...access.SubscribeOption) <-chan flow.BlockEvents); ok { r0 = rf(ctx, startHeight, filter, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan *flow.BlockEvents) + r0 = ret.Get(0).(<-chan flow.BlockEvents) } } @@ -652,7 +652,7 @@ func (_m *Client) SubscribeEventsByBlockHeight(ctx context.Context, startHeight } // SubscribeEventsByBlockID provides a mock function with given fields: ctx, startBlockID, filter, opts -func (_m *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan *flow.BlockEvents, <-chan error, error) { +func (_m *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flow.Identifier, filter flow.EventFilter, opts ...access.SubscribeOption) (<-chan flow.BlockEvents, <-chan error, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -662,12 +662,12 @@ func (_m *Client) SubscribeEventsByBlockID(ctx context.Context, startBlockID flo _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan *flow.BlockEvents - if rf, ok := ret.Get(0).(func(context.Context, flow.Identifier, flow.EventFilter, ...access.SubscribeOption) <-chan *flow.BlockEvents); ok { + var r0 <-chan flow.BlockEvents + if rf, ok := ret.Get(0).(func(context.Context, flow.Identifier, flow.EventFilter, ...access.SubscribeOption) <-chan flow.BlockEvents); ok { r0 = rf(ctx, startBlockID, filter, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan *flow.BlockEvents) + r0 = ret.Get(0).(<-chan flow.BlockEvents) } } diff --git a/go.mod b/go.mod index 41816374d..2ef0a280e 100644 --- a/go.mod +++ b/go.mod @@ -66,6 +66,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d // indirect + github.com/vektra/mockery v1.1.2 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/blake3 v0.2.4 // indirect go.opencensus.io v0.24.0 // indirect @@ -78,12 +79,14 @@ require ( golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/go.sum b/go.sum index b3199cd98..a5c515401 100644 --- a/go.sum +++ b/go.sum @@ -154,10 +154,12 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -168,8 +170,11 @@ github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8 github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c/go.mod h1:JlzghshsemAMDGZLytTFY8C1JQxQPhnatWqNwUXjggo= github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d h1:5JInRQbk5UBX8JfUvKh2oYTLMVwj3p6n+wapDDm7hko= github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d/go.mod h1:Nlx5Y115XQvNcIdIy7dZXaNSUpzwBSge4/Ivk93/Yog= +github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4= +github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= @@ -208,6 +213,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -217,6 +223,7 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -228,6 +235,7 @@ golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= @@ -262,6 +270,7 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= From 091c638e30cc4251a502070c884cda11442a8db8 Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Fri, 24 Jan 2025 13:43:37 +0200 Subject: [PATCH 8/9] run go mod tidy --- go.mod | 3 --- go.sum | 9 --------- 2 files changed, 12 deletions(-) diff --git a/go.mod b/go.mod index 2ef0a280e..41816374d 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,6 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c // indirect github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d // indirect - github.com/vektra/mockery v1.1.2 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/blake3 v0.2.4 // indirect go.opencensus.io v0.24.0 // indirect @@ -79,14 +78,12 @@ require ( golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect - golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/go.sum b/go.sum index a5c515401..b3199cd98 100644 --- a/go.sum +++ b/go.sum @@ -154,12 +154,10 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -170,11 +168,8 @@ github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8 github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c/go.mod h1:JlzghshsemAMDGZLytTFY8C1JQxQPhnatWqNwUXjggo= github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d h1:5JInRQbk5UBX8JfUvKh2oYTLMVwj3p6n+wapDDm7hko= github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d/go.mod h1:Nlx5Y115XQvNcIdIy7dZXaNSUpzwBSge4/Ivk93/Yog= -github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4= -github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= @@ -213,7 +208,6 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -223,7 +217,6 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -235,7 +228,6 @@ golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= @@ -270,7 +262,6 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= From 158f2d471af5bbbe26b1a7ad4269fcde58c5d448 Mon Sep 17 00:00:00 2001 From: Illia Malachyn Date: Fri, 31 Jan 2025 13:06:06 +0200 Subject: [PATCH 9/9] return nil ptr instead of ptr to empty object --- access/grpc/convert/convert.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/access/grpc/convert/convert.go b/access/grpc/convert/convert.go index c01d4a5fb..5318b9b7a 100644 --- a/access/grpc/convert/convert.go +++ b/access/grpc/convert/convert.go @@ -335,7 +335,7 @@ func BlockHeaderToMessage(b flow.BlockHeader) (*entities.BlockHeader, error) { func MessageToBlockHeader(m *entities.BlockHeader) (*flow.BlockHeader, error) { if m == nil { - return &flow.BlockHeader{}, ErrEmptyMessage + return nil, ErrEmptyMessage } var timestamp time.Time @@ -346,7 +346,7 @@ func MessageToBlockHeader(m *entities.BlockHeader) (*flow.BlockHeader, error) { timeoutCertificate, err := MessageToTimeoutCertificate(m.GetLastViewTc()) if err != nil { - return &flow.BlockHeader{}, fmt.Errorf("error converting timeout certificate: %w", err) + return nil, fmt.Errorf("error converting timeout certificate: %w", err) } return &flow.BlockHeader{ @@ -425,7 +425,7 @@ func QuorumCertificateToMessage(qc flow.QuorumCertificate) (*entities.QuorumCert func MessageToBlockDigest(m *access.SubscribeBlockDigestsResponse) (*flow.BlockDigest, error) { if m == nil { - return &flow.BlockDigest{}, ErrEmptyMessage + return nil, ErrEmptyMessage } return &flow.BlockDigest{