Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
72d092ec
Commit
72d092ec
authored
Oct 15, 2020
by
Kelvin Fichter
Browse files
Options
Browse Files
Download
Plain Diff
Linted again
parents
51ee302a
ec851f88
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
OVM_CanonicalTransactionChain.sol
...stic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol
+4
-2
iOVM_CanonicalTransactionChain.sol
...ic-ethereum/iOVM/chain/iOVM_CanonicalTransactionChain.sol
+4
-2
OVM_CanonicalTransactionChain.spec.ts
...contracts/OVM/chain/OVM_CanonicalTransactionChain.spec.ts
+6
-6
No files found.
packages/contracts/contracts/optimistic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol
View file @
72d092ec
...
...
@@ -220,7 +220,8 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
emit QueueBatchAppended(
nextQueueIndex - _numQueuedTransactions,
_numQueuedTransactions
_numQueuedTransactions,
getTotalElements()
);
}
...
...
@@ -340,7 +341,8 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, OVM_Ba
emit SequencerBatchAppended(
nextQueueIndex - numQueuedTransactions,
numQueuedTransactions
numQueuedTransactions,
getTotalElements()
);
}
...
...
packages/contracts/contracts/optimistic-ethereum/iOVM/chain/iOVM_CanonicalTransactionChain.sol
View file @
72d092ec
...
...
@@ -28,12 +28,14 @@ interface iOVM_CanonicalTransactionChain is iOVM_BaseChain {
event QueueBatchAppended(
uint256 _startingQueueIndex,
uint256 _numQueueElements
uint256 _numQueueElements,
uint256 _totalElements
);
event SequencerBatchAppended(
uint256 _startingQueueIndex,
uint256 _numQueueElements
uint256 _numQueueElements,
uint256 _totalElements
);
...
...
packages/contracts/test/contracts/OVM/chain/OVM_CanonicalTransactionChain.spec.ts
View file @
72d092ec
...
...
@@ -423,7 +423,7 @@ describe('OVM_CanonicalTransactionChain', () => {
).
appendQueueBatch
(
1
)
)
.
to
.
emit
(
OVM_CanonicalTransactionChain
,
'
QueueBatchAppended
'
)
.
withArgs
(
0
,
1
)
.
withArgs
(
0
,
1
,
1
)
})
})
...
...
@@ -438,13 +438,13 @@ describe('OVM_CanonicalTransactionChain', () => {
it
(
'
should be able to append a single element
'
,
async
()
=>
{
await
expect
(
OVM_CanonicalTransactionChain
.
appendQueueBatch
(
1
))
.
to
.
emit
(
OVM_CanonicalTransactionChain
,
'
QueueBatchAppended
'
)
.
withArgs
(
0
,
1
)
.
withArgs
(
0
,
1
,
1
)
})
it
(
`should be able to append
${
size
}
elements`
,
async
()
=>
{
await
expect
(
OVM_CanonicalTransactionChain
.
appendQueueBatch
(
size
))
.
to
.
emit
(
OVM_CanonicalTransactionChain
,
'
QueueBatchAppended
'
)
.
withArgs
(
0
,
size
)
.
withArgs
(
0
,
size
,
size
)
})
it
(
`should revert if appending
${
size
}
+ 1 elements`
,
async
()
=>
{
...
...
@@ -721,7 +721,7 @@ describe('OVM_CanonicalTransactionChain', () => {
OVM_CanonicalTransactionChain
,
'
SequencerBatchAppended
'
)
.
withArgs
(
0
,
0
)
.
withArgs
(
0
,
0
,
size
)
})
})
})
...
...
@@ -772,7 +772,7 @@ describe('OVM_CanonicalTransactionChain', () => {
OVM_CanonicalTransactionChain
,
'
SequencerBatchAppended
'
)
.
withArgs
(
0
,
size
)
.
withArgs
(
0
,
size
,
size
*
2
)
})
})
...
...
@@ -815,7 +815,7 @@ describe('OVM_CanonicalTransactionChain', () => {
OVM_CanonicalTransactionChain
,
'
SequencerBatchAppended
'
)
.
withArgs
(
0
,
spacing
)
.
withArgs
(
0
,
spacing
,
size
+
spacing
)
})
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment