From 4ef08d71461842509ecda44de4606a2b4541f6ac Mon Sep 17 00:00:00 2001 From: rian Date: Mon, 20 May 2024 11:06:27 +0300 Subject: [PATCH] lint --- builder/builder.go | 15 ++++++++------- builder/builder_test.go | 17 +++++++++-------- node/node.go | 3 +-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/builder/builder.go b/builder/builder.go index e763b7738f..ab49ad3aea 100644 --- a/builder/builder.go +++ b/builder/builder.go @@ -360,22 +360,23 @@ func (b *Builder) runTxn(txn *mempool.BroadcastedTransaction) error { b.pendingBlock.Block.EventCount += uint64(len(receipt.Events)) return nil } -func (builder *Builder) getSyncData(blockNumber uint64) (*core.Block, *core.StateUpdate, - map[felt.Felt]core.Class, error) { - block, err := builder.starknetData.BlockByNumber(context.Background(), blockNumber) + +func (b *Builder) getSyncData(blockNumber uint64) (*core.Block, *core.StateUpdate, + map[felt.Felt]core.Class, error, +) { + block, err := b.starknetData.BlockByNumber(context.Background(), blockNumber) if err != nil { return nil, nil, nil, err } - su, err := builder.starknetData.StateUpdate(context.Background(), blockNumber) + su, err := b.starknetData.StateUpdate(context.Background(), blockNumber) if err != nil { return nil, nil, nil, err } txns := block.Transactions classes := make(map[felt.Felt]core.Class) for _, txn := range txns { - switch t := txn.(type) { - case *core.DeclareTransaction: - class, err := builder.starknetData.Class(context.Background(), t.ClassHash) + if t, ok := txn.(*core.DeclareTransaction); ok { + class, err := b.starknetData.Class(context.Background(), t.ClassHash) if err != nil { return nil, nil, nil, err } diff --git a/builder/builder_test.go b/builder/builder_test.go index 02e4148915..59fb139d0a 100644 --- a/builder/builder_test.go +++ b/builder/builder_test.go @@ -399,15 +399,16 @@ func TestSepoliaBuildBlocks(t *testing.T) { var i uint64 var block *core.Block + var err2 error for i = 0; i < 2; i++ { - block, err = gw.BlockByNumber(context.Background(), i) - require.NoError(t, err) + block, err2 = gw.BlockByNumber(context.Background(), i) + require.NoError(t, err2) - su, err := gw.StateUpdate(context.Background(), i) - require.NoError(t, err) + su, err2 := gw.StateUpdate(context.Background(), i) + require.NoError(t, err2) - snData.EXPECT().BlockByNumber(context.Background(), uint64(i)).Return(block, nil) - snData.EXPECT().StateUpdate(context.Background(), uint64(i)).Return(su, nil) + snData.EXPECT().BlockByNumber(context.Background(), i).Return(block, nil) + snData.EXPECT().StateUpdate(context.Background(), i).Return(su, nil) } classHashes := []string{ "0x5c478ee27f2112411f86f207605b2e2c58cdb647bac0df27f660ef2252359c6", @@ -417,8 +418,8 @@ func TestSepoliaBuildBlocks(t *testing.T) { for _, hash := range classHashes { classHash := utils.HexToFelt(t, hash) - class, err := gw.Class(context.Background(), classHash) - require.NoError(t, err) + class, err2 := gw.Class(context.Background(), classHash) + require.NoError(t, err2) snData.EXPECT().Class(context.Background(), classHash).Return(class, nil) } diff --git a/node/node.go b/node/node.go index 1ea34b643b..72d2cc41a6 100644 --- a/node/node.go +++ b/node/node.go @@ -162,12 +162,11 @@ func New(cfg *Config, version string) (*Node, error) { //nolint:gocyclo,funlen } poolDB, _ := pebble.NewMem() p := mempool.New(poolDB) - sequencer := builder.New(pKey, new(felt.Felt).SetUint64(1337), chain, nodeVM, time.Second*time.Duration(cfg.SeqBlockTime), p, //nolint: gomnd + sequencer := builder.New(pKey, new(felt.Felt).SetUint64(1337), chain, nodeVM, time.Second*time.Duration(cfg.SeqBlockTime), p, //nolint: gomnd,lll log).WithBootstrap(true).WithStarknetData(starknetData).WithBootstrapToBlock(2) rpcHandler = rpc.New(chain, sequencer, throttledVM, version, &cfg.Network, log).WithMempool(p) services = append(services, sequencer) } else { - synchronizer := sync.New(chain, starknetData, log, cfg.PendingPollInterval, dbIsRemote) gatewayClient := gateway.NewClient(cfg.Network.GatewayURL, log).WithUserAgent(ua).WithAPIKey(cfg.GatewayAPIKey)