change private key loading logic #3621

CoderZhi · 2022-09-01T21:50:31Z

Merge PrivateKeyConfigFile and ProducerPrivKey
Move PrivateKeyConfigFileMethod to blockchain.Config and rename it to ProducerPrivKeySchema
Load ProducerPrivKey according to ProducerPrivKeySchema
Add sync.Once to prevent blockchain.SetProducerPrivKey being called multiple times.

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)

Test Configuration:

Firmware version:
Hardware:
Toolchain:
SDK:

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 · 2022-09-01T23:49:22Z

blockchain/config.go

@@ -25,6 +26,7 @@ import (
 type (
 	// Config is the config struct for blockchain package
 	Config struct {
+		producerPrivKeyLoader  sync.Once


defined but not used?
also, this can be outside of the Config struct?

codecov · 2022-09-02T00:23:32Z

Codecov Report

Merging #3621 (106a43d) into master (a20e489) will decrease coverage by 1.03%.
The diff coverage is 71.24%.

@@            Coverage Diff             @@
##           master    #3621      +/-   ##
==========================================
- Coverage   75.43%   74.39%   -1.04%     
==========================================
  Files         247      260      +13     
  Lines       22845    23581     +736     
==========================================
+ Hits        17233    17543     +310     
- Misses       4685     5109     +424     
- Partials      927      929       +2

Impacted Files	Coverage Δ
action/action_deserializer.go	`57.14% <ø> (ø)`
action/protocol/poll/nativestaking.go	`41.08% <0.00%> (-0.65%)`	⬇️
action/protocol/poll/staking_command.go	`10.71% <0.00%> (ø)`
action/protocol/staking/read_state.go	`15.38% <0.00%> (ø)`
action/protocol/vote/probationlist.go	`87.50% <ø> (ø)`
api/blocklistener.go	`70.73% <0.00%> (ø)`
api/websocket.go	`5.17% <0.00%> (-0.19%)`	⬇️
blockchain/block/block_deserializer.go	`71.15% <ø> (ø)`
blockchain/blockchain.go	`0.89% <0.00%> (ø)`
blockchain/filedao/filedao_legacy.go	`85.80% <ø> (ø)`
... and 107 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

dustinxie · 2022-09-02T03:04:06Z

blockchain/config.go

 	case "hashiCorpVault":
-		cli, err := newVaultClient(&pc.VaultConfig)
+		yaml, err := config.NewYAML(config.Expand(os.LookupEnv), config.File(cfg.ProducerPrivKey))
