Skip to content

Commit

Permalink
Use PascalCase for network enum variants
Browse files Browse the repository at this point in the history 
Linter complained about the `SEPOLIA_INTEGRATION` variant.
  • Loading branch information
@joshklop @omerfirmak
joshklop authored and omerfirmak committed Nov 22, 2023
1 parent 769a0a4 commit ccf3dfa
Show file tree
Hide file tree
Showing 25 changed files with 269 additions and 269 deletions.
18 changes: 9 additions & 9 deletions adapters/sn2core/sn2core_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ func TestAdaptBlock(t *testing.T) {
}{
{
number: 147,
network: utils.MAINNET,
network: utils.Mainnet,
},
{
number: 11817,
protocolVersion: "0.10.1",
network: utils.MAINNET,
network: utils.Mainnet,
},
{
number: 304740,
protocolVersion: "0.12.1",
network: utils.INTEGRATION,
network: utils.Integration,
sig: &starknet.Signature{
Signature: []*felt.Felt{utils.HexToFelt(t, "0x44"), utils.HexToFelt(t, "0x37")},
},
Expand Down Expand Up @@ -88,7 +88,7 @@ func TestAdaptBlock(t *testing.T) {
func TestStateUpdate(t *testing.T) {
numbers := []uint64{0, 1, 2, 21656}

client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)
ctx := context.Background()

for _, number := range numbers {
Expand Down Expand Up @@ -139,7 +139,7 @@ func TestStateUpdate(t *testing.T) {
}

t.Run("v0.11.0 state update", func(t *testing.T) {
integClient := feeder.NewTestClient(t, utils.INTEGRATION)
integClient := feeder.NewTestClient(t, utils.Integration)

t.Run("declared Cairo0 classes", func(t *testing.T) {
feederUpdate, err := integClient.StateUpdate(ctx, "283746")
Expand Down Expand Up @@ -181,7 +181,7 @@ func TestClassV0(t *testing.T) {
"0x56b96c1d1bbfa01af44b465763d1b71150fa00c6c9d54c3947f57e979ff68c3",
}

client := feeder.NewTestClient(t, utils.GOERLI)
client := feeder.NewTestClient(t, utils.Goerli)
ctx := context.Background()

for _, hashString := range classHashes {
Expand Down Expand Up @@ -218,8 +218,8 @@ func TestClassV0(t *testing.T) {
}

func TestTransaction(t *testing.T) {
clientGoerli := feeder.NewTestClient(t, utils.GOERLI)
clientMainnet := feeder.NewTestClient(t, utils.MAINNET)
clientGoerli := feeder.NewTestClient(t, utils.Goerli)
clientMainnet := feeder.NewTestClient(t, utils.Mainnet)
ctx := context.Background()

t.Run("invoke transaction", func(t *testing.T) {
Expand Down Expand Up @@ -330,7 +330,7 @@ func TestTransaction(t *testing.T) {
}

func TestClassV1(t *testing.T) {
client := feeder.NewTestClient(t, utils.INTEGRATION)
client := feeder.NewTestClient(t, utils.Integration)

classHash := utils.HexToFelt(t, "0x1cd2edfb485241c4403254d550de0a097fa76743cd30696f714a491a454bad5")

Expand Down
58 changes: 29 additions & 29 deletions blockchain/blockchain_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
var emptyCommitments = core.BlockCommitments{}

func TestNew(t *testing.T) {
client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)
gw := adaptfeeder.New(client)
log := utils.NewNopZapLogger()
t.Run("empty blockchain's head is nil", func(t *testing.T) {
chain := blockchain.New(pebble.NewMemTest(t), utils.MAINNET, log)
assert.Equal(t, utils.MAINNET, chain.Network())
chain := blockchain.New(pebble.NewMemTest(t), utils.Mainnet, log)
assert.Equal(t, utils.Mainnet, chain.Network())
b, err := chain.Head()
assert.Nil(t, b)
assert.EqualError(t, err, db.ErrKeyNotFound.Error())
Expand All @@ -38,22 +38,22 @@ func TestNew(t *testing.T) {
require.NoError(t, err)

testDB := pebble.NewMemTest(t)
chain := blockchain.New(testDB, utils.MAINNET, log)
chain := blockchain.New(testDB, utils.Mainnet, log)
assert.NoError(t, chain.Store(block0, &emptyCommitments, stateUpdate0, nil))

chain = blockchain.New(testDB, utils.MAINNET, log)
chain = blockchain.New(testDB, utils.Mainnet, log)
b, err := chain.Head()
require.NoError(t, err)
assert.Equal(t, block0, b)
})
}

func TestHeight(t *testing.T) {
client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)
gw := adaptfeeder.New(client)
log := utils.NewNopZapLogger()
t.Run("return nil if blockchain is empty", func(t *testing.T) {
chain := blockchain.New(pebble.NewMemTest(t), utils.GOERLI, log)
chain := blockchain.New(pebble.NewMemTest(t), utils.Goerli, log)
_, err := chain.Height()
assert.Error(t, err)
})
Expand All @@ -65,20 +65,20 @@ func TestHeight(t *testing.T) {
require.NoError(t, err)

testDB := pebble.NewMemTest(t)
chain := blockchain.New(testDB, utils.MAINNET, log)
chain := blockchain.New(testDB, utils.Mainnet, log)
assert.NoError(t, chain.Store(block0, &emptyCommitments, stateUpdate0, nil))

chain = blockchain.New(testDB, utils.MAINNET, log)
chain = blockchain.New(testDB, utils.Mainnet, log)
height, err := chain.Height()
require.NoError(t, err)
assert.Equal(t, block0.Number, height)
})
}

func TestBlockByNumberAndHash(t *testing.T) {
chain := blockchain.New(pebble.NewMemTest(t), utils.GOERLI, utils.NewNopZapLogger())
chain := blockchain.New(pebble.NewMemTest(t), utils.Goerli, utils.NewNopZapLogger())
t.Run("same block is returned for both GetBlockByNumber and GetBlockByHash", func(t *testing.T) {
client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)
gw := adaptfeeder.New(client)

block, err := gw.BlockByNumber(context.Background(), 0)
Expand Down Expand Up @@ -112,7 +112,7 @@ func TestVerifyBlock(t *testing.T) {
h1, err := new(felt.Felt).SetRandom()
require.NoError(t, err)

chain := blockchain.New(pebble.NewMemTest(t), utils.MAINNET, utils.NewNopZapLogger())
chain := blockchain.New(pebble.NewMemTest(t), utils.Mainnet, utils.NewNopZapLogger())

t.Run("error if chain is empty and incoming block number is not 0", func(t *testing.T) {
block := &core.Block{Header: &core.Header{Number: 10}}
Expand All @@ -124,7 +124,7 @@ func TestVerifyBlock(t *testing.T) {
assert.EqualError(t, chain.VerifyBlock(block), "block's parent hash does not match head block hash")
})

client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)

gw := adaptfeeder.New(client)
mainnetBlock0, err := gw.BlockByNumber(context.Background(), 0)
Expand Down Expand Up @@ -174,9 +174,9 @@ func TestSanityCheckNewHeight(t *testing.T) {
h1, err := new(felt.Felt).SetRandom()
require.NoError(t, err)

chain := blockchain.New(pebble.NewMemTest(t), utils.MAINNET, utils.NewNopZapLogger())
chain := blockchain.New(pebble.NewMemTest(t), utils.Mainnet, utils.NewNopZapLogger())

client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)

gw := adaptfeeder.New(client)

Expand Down Expand Up @@ -209,7 +209,7 @@ func TestSanityCheckNewHeight(t *testing.T) {
}

func TestStore(t *testing.T) {
client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)
gw := adaptfeeder.New(client)
log := utils.NewNopZapLogger()

Expand All @@ -220,7 +220,7 @@ func TestStore(t *testing.T) {
require.NoError(t, err)

t.Run("add block to empty blockchain", func(t *testing.T) {
chain := blockchain.New(pebble.NewMemTest(t), utils.MAINNET, log)
chain := blockchain.New(pebble.NewMemTest(t), utils.Mainnet, log)
require.NoError(t, chain.Store(block0, &emptyCommitments, stateUpdate0, nil))

headBlock, err := chain.Head()
Expand All @@ -246,7 +246,7 @@ func TestStore(t *testing.T) {
stateUpdate1, err := gw.StateUpdate(context.Background(), 1)
require.NoError(t, err)

chain := blockchain.New(pebble.NewMemTest(t), utils.MAINNET, log)
chain := blockchain.New(pebble.NewMemTest(t), utils.Mainnet, log)
require.NoError(t, chain.Store(block0, &emptyCommitments, stateUpdate0, nil))
require.NoError(t, chain.Store(block1, &emptyCommitments, stateUpdate1, nil))

Expand All @@ -269,9 +269,9 @@ func TestStore(t *testing.T) {
}

func TestTransactionAndReceipt(t *testing.T) {
chain := blockchain.New(pebble.NewMemTest(t), utils.MAINNET, utils.NewNopZapLogger())
chain := blockchain.New(pebble.NewMemTest(t), utils.Mainnet, utils.NewNopZapLogger())

client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)
gw := adaptfeeder.New(client)

for i := uint64(0); i < 3; i++ {
Expand Down Expand Up @@ -357,9 +357,9 @@ func TestTransactionAndReceipt(t *testing.T) {

func TestState(t *testing.T) {
testDB := pebble.NewMemTest(t)
chain := blockchain.New(testDB, utils.MAINNET, utils.NewNopZapLogger())
chain := blockchain.New(testDB, utils.Mainnet, utils.NewNopZapLogger())

client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)
gw := adaptfeeder.New(client)

t.Run("head with no blocks", func(t *testing.T) {
Expand Down Expand Up @@ -420,9 +420,9 @@ func TestState(t *testing.T) {

func TestEvents(t *testing.T) {
testDB := pebble.NewMemTest(t)
chain := blockchain.New(testDB, utils.GOERLI2, utils.NewNopZapLogger())
chain := blockchain.New(testDB, utils.Goerli2, utils.NewNopZapLogger())

client := feeder.NewTestClient(t, utils.GOERLI2)
client := feeder.NewTestClient(t, utils.Goerli2)
gw := adaptfeeder.New(client)

for i := 0; i < 7; i++ {
Expand Down Expand Up @@ -539,9 +539,9 @@ func TestEvents(t *testing.T) {

func TestRevert(t *testing.T) {
testdb := pebble.NewMemTest(t)
chain := blockchain.New(testdb, utils.MAINNET, utils.NewNopZapLogger())
chain := blockchain.New(testdb, utils.Mainnet, utils.NewNopZapLogger())

client := feeder.NewTestClient(t, utils.MAINNET)
client := feeder.NewTestClient(t, utils.Mainnet)
gw := adaptfeeder.New(client)

for i := uint64(0); i < 3; i++ {
Expand Down Expand Up @@ -623,7 +623,7 @@ func TestL1Update(t *testing.T) {

for _, head := range heads {
t.Run(fmt.Sprintf("update L1 head to block %d", head.BlockNumber), func(t *testing.T) {
chain := blockchain.New(pebble.NewMemTest(t), utils.MAINNET, utils.NewNopZapLogger())
chain := blockchain.New(pebble.NewMemTest(t), utils.Mainnet, utils.NewNopZapLogger())
require.NoError(t, chain.SetL1Head(head))
got, err := chain.L1Head()
require.NoError(t, err)
Expand All @@ -634,8 +634,8 @@ func TestL1Update(t *testing.T) {

func TestPending(t *testing.T) {
testDB := pebble.NewMemTest(t)
chain := blockchain.New(testDB, utils.MAINNET, utils.NewNopZapLogger())
client := feeder.NewTestClient(t, utils.MAINNET)
chain := blockchain.New(testDB, utils.Mainnet, utils.NewNopZapLogger())
client := feeder.NewTestClient(t, utils.Mainnet)
gw := adaptfeeder.New(client)

b, err := gw.BlockByNumber(context.Background(), 0)
Expand Down
Loading

0 comments on commit ccf3dfa

Please sign in to comment.