Blockchain client requests #965
Conversation
Codecov Report
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
Please don't merge until Thursday (eventually I will just do the releases itself already on Wednesday and do only the announcements on Thursday, then we can proceed with the other stuff one day earlier, should be ok I guess). |
|
Yeah, I did not intend to merge anything until we release 😄 I also need to add some stuff here. |
holgerd77
force-pushed
the
blockchain-client-requests
branch
from
f710f9e
to
f097231
Compare
|
Rebased this. |
|
Hi @holgerd77, thanks for the rebase, I intend to keep this WIP until we have integrated the client, then this PR will also remove the blockchain wrapper from the client 👍 |
|
@jochem-brouwer yeah, this was rather a test if a rebase (in general) still works well with the devp2p integration PR merged, since rebase went through without problems I thought I could as well push hehe 😁 |
jochem-brouwer
force-pushed
the
blockchain-client-requests
branch
from
f097231
to
6d2f7a0
Compare
|
Rebased on master. This PR will remove the blockchain wrapper from the client. |
blockchain: add maxBlocks parameter to iterator
jochem-brouwer
force-pushed
the
blockchain-client-requests
branch
from
6d2f7a0
to
f16177e
Compare
|
Removing this blockchain wrapper in client is a bit more work than anticipated, so I will open a subsequent PR for that one. Ready for review. |
packages/blockchain/src/index.ts
Outdated
| @@ -770,6 +772,10 @@ export default class Blockchain implements BlockchainInterface { | |||
| lastBlock = block | |||
| await onBlock(block, reorg) | |||
| blockNumber.iaddn(1) | |||
| blocksRanCounter++ | |||
| if (maxBlocks && blocksRanCounter == maxBlocks) { | |||
There was a problem hiding this comment.
Two things here:
-
I guess this would be the only place in our whole codebase where the double equals would be used 😛, can we update to the standard triple equals?
-
The break condition is unnecessarily late in the loop (correct me if I am wrong), this gets most obvious when ran on an edge case (
maxBlocks=== 0) where code is executed which shouldn't be executed which could lead to side effects. This should be placed at the top (eventually just directly integrate into the while condition, something likewhile (maxBlocks === undefined || maxBlocks && blocksRanCounter == maxBlocks))? Can also be done separately as well though.
There was a problem hiding this comment.
Should be fixed in 833264f 😄
There was a problem hiding this comment.
Have re-fixed in 5497bc0
|
Ah yes, you are right, I should've added some tests. Will fix (your comments also), thanks! 😄 |
| st.equals(i, 0) | ||
| st.end() | ||
| } | ||
| ) |
blockchain: add setHead / iterator tests blockchain: remove unnecessary iterator logic
jochem-brouwer
force-pushed
the
blockchain-client-requests
branch
from
833264f
to
5497bc0
Compare
Related: #960
This PR introduces some handy things:
afterBlockandafterTxnow get access to which block/tx is finished. Blockchainiteratorgets an optional parameter which specifies how many blocks should (at most) be ran. It also adds asetHeadmethod which allows updating the head of a certain tag, and this is saved in the DB. Related issue: #691.