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

[config] move config.Chain to blockchain package #3511

Merged
merged 4 commits into from
Jul 8, 2022

Conversation

dustinxie
Copy link
Member

Description

as title

Fixes #(issue)

Type of change

Please delete options that are not relevant.

  • [] Bug fix (non-breaking change which fixes an issue)
  • [] New feature (non-breaking change which adds functionality)
  • Code refactor or improvement
  • [] Breaking change (fix or feature that would cause a new or changed behavior of existing functionality)
  • [] This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • make test
  • [] fullsync
  • [] Other test (please specify)

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@dustinxie dustinxie requested a review from a team as a code owner July 7, 2022 18:01
@@ -26,12 +27,16 @@ import (
"github.com/iotexproject/iotex-core/blockchain/blockdao"
"github.com/iotexproject/iotex-core/blockchain/filedao"
"github.com/iotexproject/iotex-core/blockchain/genesis"
"github.com/iotexproject/iotex-core/config"
Copy link
Member Author

@dustinxie dustinxie Jul 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the main blocking dependency this PR tries to get rid of

}
return ""
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to blockchain/config.go

@codecov
Copy link

codecov bot commented Jul 7, 2022

Codecov Report

Merging #3511 (8fa0521) into master (a20e489) will decrease coverage by 0.89%.
The diff coverage is 42.42%.

❗ Current head 8fa0521 differs from pull request most recent head edd88cb. Consider uploading reports for the commit edd88cb to get more accurate results

@@            Coverage Diff             @@
##           master    #3511      +/-   ##
==========================================
- Coverage   75.43%   74.53%   -0.90%     
==========================================
  Files         247      250       +3     
  Lines       22845    23123     +278     
==========================================
+ Hits        17233    17235       +2     
- Misses       4685     4961     +276     
  Partials      927      927              
Impacted Files Coverage Δ
blockchain/blockchain.go 0.87% <0.00%> (ø)
config/config.go 92.68% <ø> (+7.92%) ⬆️
blockchain/config.go 65.78% <65.78%> (ø)
blockchain/filedao/testing.go 59.71% <100.00%> (ø)
state/factory/factory.go 78.91% <100.00%> (ø)
state/factory/statedb.go 79.24% <100.00%> (ø)
blockchain/pubsubmanager.go 0.00% <0.00%> (ø)

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 9df8aed...edd88cb. Read the comment docs.

)

func generateRandomKey(scheme string) string {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's only used in config.go, so it shouldn't be placed here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

log.S().Panicf("Failed to execute blockchain creation option %p: %v", opt, err)
}
}
if chain.pubSubManager == nil {
chain.pubSubManager = NewPubSub(200)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have pubsubManager be nil if no option is passed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, if no option, it's nil, so create according to default value

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After offline discussion, the buffersize of pubManager is added into the config of blockchain.

@dustinxie dustinxie merged commit fef3ed2 into iotexproject:master Jul 8, 2022
pocockn added a commit to pocockn/iotex-core that referenced this pull request Jul 19, 2022
* upstream/master: (28 commits)
  [ioctl] Incorrect conversion between integer types (iotexproject#3522)
  [action] fix incorrect conversion between integer types (iotexproject#3545)
  [test] fix TestLoadBlockchainfromDB (iotexproject#3521)
  [ioctl] correct Chinese usage message (iotexproject#3510)
  fix err not hanled (iotexproject#3509)
  add ReadHeaderTimeout (iotexproject#3539)
  [iotcl] Reset config cmd (iotexproject#3496)
  Update gosec.yaml
  Update ci.yaml
  Update analysis.yaml
  Delete gosec.yaml.bak
  Create gosec.yaml
  [config] move config.ActPool to actpool package refactor (iotexproject#3514)
  Update ci.yaml
  Update analysis.yaml
  Update analysis.yaml
  [config] move config.Chain to blockchain package (iotexproject#3511)
  remove circleci (iotexproject#3498)
  [ioctl] Build block bucketlist command line into new ioctl (iotexproject#3469)
  [config] remove  EVMNetworkID() and SetEVMNetworkID() (iotexproject#3503)
  ...
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