Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mock ingest transactions & produce blocks #325

Merged
merged 15 commits into from
Jul 22, 2019
Merged

Mock ingest transactions & produce blocks #325

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cf08834
Initial commit of Aggregator StateUpdate Ingestion
willmeister Jul 9, 2019
b1b7791
Adds:
willmeister Jul 10, 2019
e7117ff
- Added BlockManager, Block DB CommitmentContract, and probably other…
willmeister Jul 10, 2019
8a2682e
Adding async-mutex lib and adding mutual exclusion around BlockDB blo…
willmeister Jul 10, 2019
afaf746
Adding BlockManager tests and handling mutual exclusion in Block Subm…
willmeister Jul 11, 2019
9b60b71
Adding test to make sure empty blocks are not submitted
willmeister Jul 11, 2019
3d91ac8
- Adding tests for BlockDB
willmeister Jul 15, 2019
0dc31ef
Changing tslint rule to be repo-wide
willmeister Jul 15, 2019
1c8f514
Adding examples and comments in rangesSpanRange for clarity
willmeister Jul 15, 2019
2c7c789
Adding error details
willmeister Jul 15, 2019
7ce5099
renaming rangesSpanRange to doRangesSpanRange, removing unused import
willmeister Jul 22, 2019
9c70d45
removoing `witness` from Aggregator.ingestTransaction(...) and updati…
willmeister Jul 22, 2019
dee7a3b
Fixing wallet nonce race condition in Deposit tests by creating a sep…
willmeister Jul 22, 2019
37b9f0c
fixing linting issues
willmeister Jul 22, 2019
8a26d52
Increasing default test timeout from 2 seconds to 5 seconds
willmeister Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions packages/core/src/app/utils/range.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ export const isRangeSubset = (subset: Range, superset: Range): boolean => {
}

/**
* Determines whether the provided Ranges collectively span the Range in question
* Determines whether the provided Ranges collectively span the Range in question.
* For instance,
* doRangesSpanRange([{start: 1, end: 3}, {start: 3, end: 5}], {start: 2, end: 4})
willmeister marked this conversation as resolved.
Show resolved Hide resolved
* returns true because there is no number in range that is not covered by at
* least one element in ranges.
*
* @param ranges the Ranges that will/won't span the rangeToSpan
* @param rangeToSpan the Range being spanned
akhila-raju marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -76,21 +80,24 @@ export const rangesSpanRange = (
ranges: Range[],
rangeToSpan: Range
): boolean => {
// Sorting the ranges by Start so we can go through them sequentially
const sortedRanges: Range[] = ranges.sort((a: Range, b: Range) => {
return a.start.lt(b.start) ? -1 : a.start.eq(b.start) ? 0 : 1
})

let spannedEnd: BigNum = rangeToSpan.start
let lowestNotSpanned: BigNum = rangeToSpan.start
for (const rangeElem of sortedRanges) {
// If our lowest range start is greater than our spannedEnd, the range cannot be spanned
if (rangeElem.start.gt(spannedEnd)) {
// If our lowest range start is greater than our lowestNotSpanned,
// the range cannot be spanned because the Ranges do not include lowestNotSpanned.
if (rangeElem.start.gt(lowestNotSpanned)) {
return false
}

spannedEnd = rangeElem.end
// Now we've covered rangeElem.start - rangeElem.end, so update lowestNotSpanned
lowestNotSpanned = rangeElem.end

// If the entire range has been spanned we can ,
if (spannedEnd.gte(rangeToSpan.end)) {
// If the entire range has been spanned we can return true
if (lowestNotSpanned.gte(rangeToSpan.end)) {
return true
}
}
Expand Down
2 changes: 1 addition & 1 deletion tslint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"member-ordering": false,
"no-empty-interface": false,
"no-implicit-dependencies": [true, "dev"],
"no-string-literal": false,
"no-string-literal": false,
"no-submodule-imports": false,
"no-unused-expression": false,
"object-literal-sort-keys": false,
Expand Down