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.

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

Client TX limiting #1657

Merged
merged 36 commits into from Nov 18, 2019
Merged

Client TX limiting #1657

merged 36 commits into from Nov 18, 2019

Conversation

evgenykuzyakov
Copy link
Collaborator

@evgenykuzyakov evgenykuzyakov commented Nov 6, 2019

This is part 3. See [part 1] and [part 2].

  • Filter transactions using Draining Iterator from the pool.
  • The order is defined by nearprotocol/nomicon#5
  • Removing ValidTransaction and Pool errors.

Fixes #1579
Ref #1507

@evgenykuzyakov
Improve TX pool to use proper order and make it faster
3000ca4
@evgenykuzyakov
Fix pool insert, add tests
671b85f
@evgenykuzyakov
Merge branch 'staging' of github.com:nearprotocol/nearcore into impro…
0fa77a5 
…ve-tx-pool
@evgenykuzyakov
Address comments
fa299c9
@evgenykuzyakov
Merge branch 'staging' of github.com:nearprotocol/nearcore into impro…
4dca419 
…ve-tx-pool
@evgenykuzyakov
Implement taking operator for transaction pool
b54a087
@evgenykuzyakov
Merge branch 'staging' of github.com:nearprotocol/nearcore into tx-li…
55a6358 
…miting
@evgenykuzyakov
Merge branch 'staging' of github.com:nearprotocol/nearcore into impro…
11338c7 
…ve-tx-pool
@evgenykuzyakov
Merge branch 'improve-tx-pool' of github.com:nearprotocol/nearcore in…
3f10089 
…to tx-limiting
@evgenykuzyakov
Allow iterator to request same keys
81828e5
@evgenykuzyakov
Merge branch 'staging' of github.com:nearprotocol/nearcore into impro…
bb35014 
…ve-tx-pool
@evgenykuzyakov
Merge branch 'improve-tx-pool' of github.com:nearprotocol/nearcore in…
4fdeecd 
…to tx-limiting
@evgenykuzyakov
Use draining iterator in the client
6d47225
@evgenykuzyakov
Merge branch 'staging' of github.com:nearprotocol/nearcore into clien…
b04f228 
…t-tx-limiting
@evgenykuzyakov
Remove ValidTransaction and Pool Error
a9b670d
@evgenykuzyakov
Merge branch 'staging' of github.com:nearprotocol/nearcore into impro…
6b06f6e 
…ve-tx-pool
@evgenykuzyakov
Merge branch 'improve-tx-pool' of github.com:nearprotocol/nearcore in…
bd1fb89 
…to tx-limiting
@evgenykuzyakov
Merge branch 'tx-limiting' of github.com:nearprotocol/nearcore into c…
c433716 
…lient-tx-limiting
@evgenykuzyakov evgenykuzyakov requested a review from nearmax Nov 6, 2019
@codecov
Copy link

@codecov codecov bot commented Nov 6, 2019 •
edited

Codecov Report

Merging #1657 into staging will increase coverage by 0.29%.
The diff coverage is 93.62%.

Impacted file tree graph

@@             Coverage Diff             @@
##           staging    #1657      +/-   ##
===========================================
+ Coverage     80.2%   80.49%   +0.29%     
===========================================
  Files          131      131              
  Lines        24862    25038     +176     
===========================================
+ Hits         19941    20155     +214     
+ Misses        4921     4883      -38
Impacted Files Coverage Δ
chain/chunks/src/types.rs 25% <ø> (+6.25%) ⬆️
chain/client/src/types.rs 82.65% <ø> (+1.65%) ⬆️
chain/chain/src/types.rs 99.05% <ø> (+1.83%) ⬆️
chain/chain/src/lib.rs 100% <ø> (ø) ⬆️
chain/client/tests/challenges.rs 92.79% <100%> (ø) ⬆️
chain/chunks/src/lib.rs 93.92% <100%> (-0.03%) ⬇️
core/primitives/src/block.rs 97.47% <100%> (ø) ⬆️
core/primitives/src/sharding.rs 98.95% <100%> (-0.01%) ⬇️
chain/chain/src/test_utils.rs 84.76% <100%> (+7.65%) ⬆️
core/crypto/src/signature.rs 94.18% <66.66%> (-0.74%) ⬇️
... and 22 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 89b2252...4fb8e71. Read the comment docs.

ilblackdragon
ilblackdragon reviewed Nov 7, 2019
View changes
near/src/runtime.rs Outdated Show resolved Hide resolved
ilblackdragon
ilblackdragon reviewed Nov 7, 2019
View changes
chain/client/src/client.rs Outdated Show resolved Hide resolved
@weekly-digest weekly-digest bot mentioned this pull request Nov 8, 2019
Closed
nearmax
nearmax requested changes Nov 13, 2019
View changes
chain/client/src/client.rs Outdated Show resolved Hide resolved
@evgenykuzyakov evgenykuzyakov changed the base branch from tx-limiting to staging Nov 13, 2019
@evgenykuzyakov evgenykuzyakov changed the title [PART 3] Client TX limiting Client TX limiting Nov 13, 2019
@evgenykuzyakov
Copy link
Collaborator Author

@evgenykuzyakov evgenykuzyakov commented Nov 13, 2019

Going to add comments before review

@evgenykuzyakov evgenykuzyakov mentioned this pull request Nov 13, 2019
Closed
@evgenykuzyakov evgenykuzyakov mentioned this pull request Nov 13, 2019
Closed
@nearmax
Copy link
Member

@nearmax nearmax commented Nov 15, 2019

Is it ready for another review?

@evgenykuzyakov
Copy link
Collaborator Author

@evgenykuzyakov evgenykuzyakov commented Nov 15, 2019

Is it ready for another review?

@nearmax Ready

@evgenykuzyakov evgenykuzyakov requested a review from nearmax Nov 16, 2019
@evgenykuzyakov evgenykuzyakov merged commit 07941ad into staging Nov 18, 2019
3 checks passed
@evgenykuzyakov evgenykuzyakov deleted the client-tx-limiting branch Nov 18, 2019
SkidanovAlex added a commit that referenced this issue Nov 19, 2019
@SkidanovAlex
Revert "Client TX limiting (#1657)"
a5c0d04 
This reverts commit 07941ad.
SkidanovAlex added a commit that referenced this issue Nov 19, 2019
@SkidanovAlex
Revert "Client TX limiting (#1657)" (#1721)
bbeed12 
This reverts commit 07941ad.
evgenykuzyakov added a commit that referenced this issue Nov 19, 2019
@evgenykuzyakov
Revert "Revert "Client TX limiting (#1657)" (#1721)"
a1f92c6 
This reverts commit bbeed12.
SkidanovAlex pushed a commit that referenced this issue Nov 19, 2019
@evgenykuzyakov @SkidanovAlex
RE: client tx limiting (#1730)
724cfe7 
* Revert "Revert "Client TX limiting (#1657)" (#1721)"

This reverts commit bbeed12.

* Reintroduce valid transactions back to the pool
@bowenwang1996 bowenwang1996 mentioned this pull request Nov 23, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ilblackdragon ilblackdragon

@SkidanovAlex SkidanovAlex

@nearmax nearmax

Assignees

@SkidanovAlex SkidanovAlex

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@evgenykuzyakov @nearmax @ilblackdragon @SkidanovAlex