Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
gzeoneth committed Jan 17, 2024
1 parent 9529776 commit 772b210
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/contract/sequencerInbox.spec.4844.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import { SequencerInbox } from '../../build/types/src/bridge/SequencerInbox'
import { execSync } from 'child_process'

Check warning on line 49 in test/contract/sequencerInbox.spec.4844.ts

View workflow job for this annotation

GitHub Actions / Contract tests

'execSync' is defined but never used. Allowed unused vars must match /^_/u
import { wait } from '@arbitrum/sdk/dist/lib/utils/lib'

Check warning on line 50 in test/contract/sequencerInbox.spec.4844.ts

View workflow job for this annotation

GitHub Actions / Contract tests

'wait' is defined but never used. Allowed unused vars must match /^_/u
import { InboxMessageDeliveredEvent } from '../../build/types/src/bridge/AbsInbox'
import { SequencerBatchDeliveredEvent } from '../../build/types/src/bridge/ISequencerInbox'
import { SequencerBatchDeliveredEvent } from '../../build/types/src/bridge/AbsBridge'

const mineBlocks = async (

Check warning on line 54 in test/contract/sequencerInbox.spec.4844.ts

View workflow job for this annotation

GitHub Actions / Contract tests

'mineBlocks' is assigned a value but never used. Allowed unused vars must match /^_/u
wallet: Wallet,
Expand Down Expand Up @@ -455,10 +455,10 @@ describe('SequencerInbox', async () => {
(b: any) =>
b.address.toLowerCase() === bridge.address.toLowerCase() &&
b.topics[0] ===
sequencerInbox.interface.getEventTopic('SequencerBatchDelivered')
bridge.interface.getEventTopic('SequencerBatchDelivered')
)
.map(
(l: any) => sequencerInbox.interface.parseLog(l).args
(l: any) => bridge.interface.parseLog(l).args
)[0] as SequencerBatchDeliveredEvent['args']
if (!batchDeliveredEvent) throw new Error('missing batch event')

Expand Down

0 comments on commit 772b210

Please sign in to comment.