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

mpm integration-test: fix discarded txn #3691

Merged
merged 1 commit into from
Aug 28, 2022

Conversation

pause125
Copy link
Collaborator

Pull request type

Please check the type of change your PR introduces:

  • Bugfix
  • Feature
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • Documentation content changes
  • Other (please describe):

What is the current behavior?

当前代码会尝试将 Discard txn 添加到 txn_accumulator 中,而 txn_accumulator 只接受 KeptVMStatus 的 txn,因此在 check 时遇到了 Discard 的 txn, 从而发生 panic 。

Issue Number: N/A

What is the new behavior?

  • Bug fixed

Other information

相关 issue: starcoinorg/starcoin-framework#95 (comment)

@codecov
Copy link

codecov bot commented Aug 28, 2022

Codecov Report

Merging #3691 (0943f76) into master (c6634ad) will decrease coverage by 0.09%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3691      +/-   ##
==========================================
- Coverage   28.50%   28.41%   -0.08%     
==========================================
  Files         588      588              
  Lines       50411    50412       +1     
  Branches    23657    23657              
==========================================
- Hits        14364    14322      -42     
+ Misses      22242    22224      -18     
- Partials    13805    13866      +61     
Flag Coverage Δ
unittests 28.41% <0.00%> (-0.08%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
vm/starcoin-transactional-test-harness/src/lib.rs 0.15% <0.00%> (-<0.01%) ⬇️
vm/natives/src/account.rs 12.50% <0.00%> (-12.50%) ⬇️
vm/natives/src/token.rs 17.78% <0.00%> (-8.88%) ⬇️
network-p2p/src/peer_info.rs 43.53% <0.00%> (-4.66%) ⬇️
vm/types/src/on_chain_config/mod.rs 38.36% <0.00%> (-4.10%) ⬇️
txpool/src/pool/listener/tests.rs 10.91% <0.00%> (-3.63%) ⬇️
types/src/account_state.rs 56.67% <0.00%> (-3.33%) ⬇️
vm/types/src/token/stc.rs 63.24% <0.00%> (-2.94%) ⬇️
vm/vm-runtime/src/starcoin_vm.rs 32.39% <0.00%> (-2.46%) ⬇️
types/src/startup_info.rs 61.49% <0.00%> (-2.22%) ⬇️
... and 62 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 f43e580...0943f76. Read the comment docs.

@baichuan3
Copy link

其它问题是单独pr修复?

@pause125
Copy link
Collaborator Author

pause125 commented Aug 28, 2022

其它问题是单独pr修复?

其他问题是指?

StarcoinFramework 里面 shared_key.movegas_check.move 这两个 case 失败的原因都是因为有 Discard 的交易,从而触发 bug 导致崩溃的。没有其他问题了。

@jolestar jolestar merged commit 8719732 into starcoinorg:master Aug 28, 2022
@baichuan3
Copy link

验证ok

@pause125 pause125 deleted the fix_discard_txn branch September 5, 2022 12:49
@pause125 pause125 mentioned this pull request Sep 6, 2022
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants