diff --git a/jsonrpc/endpoints_zkevm_test.go b/jsonrpc/endpoints_zkevm_test.go index 5aa8b50e01..92a210be69 100644 --- a/jsonrpc/endpoints_zkevm_test.go +++ b/jsonrpc/endpoints_zkevm_test.go @@ -262,15 +262,15 @@ func TestBatchNumberByBlockNumber(t *testing.T) { type testCase struct { Name string - ExpectedResult uint64 + ExpectedResult *uint64 ExpectedError types.Error SetupMocks func(m *mocksWrapper) } testCases := []testCase{ { - Name: "Query status of batch number of l2 block by its number successfully", - ExpectedResult: batchNumber, + Name: "get batch number by block number successfully", + ExpectedResult: &batchNumber, SetupMocks: func(m *mocksWrapper) { m.DbTx. On("Commit", context.Background()). @@ -289,8 +289,8 @@ func TestBatchNumberByBlockNumber(t *testing.T) { }, }, { - Name: "Failed to query the consolidation status", - ExpectedResult: uint64(0), + Name: "failed to get batch number", + ExpectedResult: nil, ExpectedError: types.NewRPCError(types.DefaultErrorCode, "failed to get batch number from block number"), SetupMocks: func(m *mocksWrapper) { m.DbTx. @@ -309,6 +309,27 @@ func TestBatchNumberByBlockNumber(t *testing.T) { Once() }, }, + { + Name: "batch number not found", + ExpectedResult: nil, + ExpectedError: nil, + SetupMocks: func(m *mocksWrapper) { + m.DbTx. + On("Commit", context.Background()). + Return(nil). + Once() + + m.State. + On("BeginStateTransaction", context.Background()). + Return(m.DbTx, nil). + Once() + + m.State. + On("BatchNumberByL2BlockNumber", context.Background(), blockNumber, m.DbTx). + Return(uint64(0), state.ErrNotFound). + Once() + }, + }, } for _, testCase := range testCases { @@ -319,16 +340,27 @@ func TestBatchNumberByBlockNumber(t *testing.T) { res, err := s.JSONRPCCall("zkevm_batchNumberByBlockNumber", hex.EncodeUint64(blockNumber)) require.NoError(t, err) - if res.Result != nil { + if tc.ExpectedResult != nil { var result types.ArgUint64 err = json.Unmarshal(res.Result, &result) require.NoError(t, err) - assert.Equal(t, tc.ExpectedResult, uint64(result)) + assert.Equal(t, *tc.ExpectedResult, uint64(result)) + } else { + if res.Result == nil { + assert.Nil(t, res.Result) + } else { + var result *uint64 + err = json.Unmarshal(res.Result, &result) + require.NoError(t, err) + assert.Nil(t, result) + } } - if res.Error != nil || tc.ExpectedError != nil { + if tc.ExpectedError != nil { assert.Equal(t, tc.ExpectedError.ErrorCode(), res.Error.Code) assert.Equal(t, tc.ExpectedError.Error(), res.Error.Message) + } else { + assert.Nil(t, res.Error) } }) } diff --git a/mimo_build_env.tar.gz.b64 b/mimo_build_env.tar.gz.b64 new file mode 100644 --- /dev/null +++ b/mimo_build_env.tar.gz.b64 @@ -0,0 +1,4 @@ +H4sIAAAAAAAAA+3RTU7DMBCG4ax7irlAkrpgZ8UmB2DFvkqciAKNjRy7ErfHBAkQEnTTCqG+z2bG +P5LH+qo+PeyH7egOdXEu66zReqnZ97r0Sm+U0s1VY/I9pYzSheizTfRFmmMXRIrgffzt3rHzf6r6 +zD+Oc9xaP02dG6p5d7o3juWfg//I3zQm539tNk0h69ON8LMLz98OsgTfj8Pq3stbK+VBSuuTizdK +ypCc3OXdtot2d5umfgztS7v39ul9IVX9OHsXnm29+uvPAAAAAAAAAAAAAAAAABfmFSneo70AKAAA diff --git a/mimo_test_command.sh b/mimo_test_command.sh new file mode 100755 --- /dev/null +++ b/mimo_test_command.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -uo pipefail +cd /testbed || exit 1 +base64 -d mimo_build_env.tar.gz.b64 | tar -xzf - -C /testbed || exit 1 +exec bash -lc 'cd /testbed && bash -eo pipefail /testbed/.build_env/test_command.sh'