Improve nodeBlockFetchSize estimates and test them #2481
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
edsko
approved these changes
Jul 30, 2020
mrBliss
force-pushed
the
mrBliss/fix-shelley-nodeblockfetchsize
branch
from
9ac12d9
to
abac6e5
Compare
|
bors merge |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 30, 2020
2481: Improve nodeBlockFetchSize estimates and test them r=mrBliss a=mrBliss Fixes #2480. Return the block size instead of the body size for Shelley. Take CBOR-in-CBOR and the EBB tag into account for Byron. Include a test in the serialisation roundtrip test skeleton. Co-authored-by: Thomas Winant <thomas@well-typed.com>
mrBliss
force-pushed
the
mrBliss/fix-shelley-nodeblockfetchsize
branch
from
abac6e5
to
e9ee584
Compare
Canceled |
mrBliss
commented
Jul 30, 2020
Comment on lines
+117
to
+127
| instance (SimpleCrypto c, Serialise ext') => Serialise (SimpleBlock' c ext ext') where | ||
| encode (SimpleBlock hdr body) = mconcat [ | ||
| CBOR.encodeListLen 2 | ||
| , encode hdr | ||
| , encode body | ||
| ] | ||
| decode = do | ||
| CBOR.decodeListLenOf 2 | ||
| hdr <- decode | ||
| body <- decode | ||
| return (SimpleBlock hdr body) |
There was a problem hiding this comment.
I went for this instead of the generic instance so it's easier to estimate the size of the block.
|
bors merge |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 30, 2020
2481: Improve nodeBlockFetchSize estimates and test them r=mrBliss a=mrBliss Fixes #2480. Return the block size instead of the body size for Shelley. Take CBOR-in-CBOR and the EBB tag into account for Byron. Include a test in the serialisation roundtrip test skeleton. Co-authored-by: Thomas Winant <thomas@well-typed.com>
Build failed |
mrBliss
force-pushed
the
mrBliss/fix-shelley-nodeblockfetchsize
branch
from
e9ee584
to
4c096d6
Compare
|
bors merge |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 30, 2020
2481: Improve nodeBlockFetchSize estimates and test them r=mrBliss a=mrBliss Fixes #2480. Return the block size instead of the body size for Shelley. Take CBOR-in-CBOR and the EBB tag into account for Byron. Include a test in the serialisation roundtrip test skeleton. Co-authored-by: Thomas Winant <thomas@well-typed.com>
Build failed |
Fixes #2480. Return the block size instead of the body size for Shelley. Take CBOR-in-CBOR and the EBB tag into account for Byron. Include a test in the serialisation roundtrip test skeleton.
mrBliss
force-pushed
the
mrBliss/fix-shelley-nodeblockfetchsize
branch
from
4c096d6
to
ae0170a
Compare
|
(Yes, I'm using CI to run my testsuites. I compiled locally with |
|
bors merge |
mrBliss
added a commit
that referenced
this pull request
Jul 31, 2020
Apparently we sometimes generate blocks that are 65536 bytes large or more, requiring a 7 byte CBOR-in-CBOR tag (65535 would only require 5 bytes), failing the test added in #2481, as our upper bound assumed 5 bytes.
mrBliss
added a commit
that referenced
this pull request
Jul 31, 2020
Apparently we sometimes generate blocks that are 65536 bytes large or more, requiring a 7 byte CBOR-in-CBOR tag (65535 would only require 5 bytes), failing the test added in #2481, as our upper bound assumed 5 bytes.
iohk-bors bot
added a commit
that referenced
this pull request
Jul 31, 2020
2484: Upper bound for CBOR-in-CBOR tag is 7 instead of 5 bytes r=mrBliss a=mrBliss Apparently we sometimes generate blocks that are 65536 bytes large or more, requiring a 7 byte CBOR-in-CBOR tag (65535 would only require 5 bytes), failing the test added in #2481, as our upper bound assumed 5 bytes. Co-authored-by: Thomas Winant <thomas@well-typed.com>
nc6
pushed a commit
that referenced
this pull request
Aug 3, 2020
Apparently we sometimes generate blocks that are 65536 bytes large or more, requiring a 7 byte CBOR-in-CBOR tag (65535 would only require 5 bytes), failing the test added in #2481, as our upper bound assumed 5 bytes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2480.
Return the block size instead of the body size for Shelley.
Take CBOR-in-CBOR and the EBB tag into account for Byron.
Include a test in the serialisation roundtrip test skeleton.