forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

remove unwanted code

Browse source
This commit is contained in:
Arpit Temani 2022-12-05 22:05:34 +05:30
parent adf8c5f1ab
commit 180d4444df
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/bor/bor_test.go
View file

@ -480,16 +480,7 @@ func TestFetchStateSyncEvents_2(t *testing.T) {
h := mocks.NewMockIHeimdallClient(ctrl)
h.EXPECT().Close().AnyTimes()
<<<<<<< HEAD
h.EXPECT().Span(gomock.Any(), uint64(1)).Return(&res.Result, nil).AnyTimes()
=======
h.EXPECT().Span(uint64(1)).Return(&res.Result, nil).AnyTimes()
h.EXPECT().FetchLatestCheckpoint().Return(&checkpoint.Checkpoint{
StartBlock: big.NewInt(1),
EndBlock: big.NewInt(2),
RootHash: common.Hash{},
}, nil).AnyTimes()
>>>>>>> 57075d000d1a6396c33d42e5da97be19bfcfb6f1
// Mock State Sync events
// at # sprintSize, events are fetched for [fromID, (block-sprint).Time)