Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
rian committed May 20, 2024
1 parent cc683bf commit 4ef08d7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
15 changes: 8 additions & 7 deletions builder/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
17 changes: 9 additions & 8 deletions builder/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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)
}

Expand Down
3 changes: 1 addition & 2 deletions node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 4ef08d7

Please sign in to comment.