Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-11-24 06:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: goify function

Browse Source 
Signed-off-by: Julian Strobl <jmastr@mailbox.org>
This commit is contained in:
Julian Strobl 2024-03-06 09:18:25 +01:00
parent f6f10b54b6
commit b8433d4279
4 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/determine_block_proposer.go
View File

@ -23,35 +23,37 @@ type KeyFile struct {
PrivKey Key `json:"priv-key"` PrivKey Key `json:"priv-key"`
} }
func GetValidatorCometBFTIdentity(ctx sdk.Context, rootDir string) (string, bool) { func GetValidatorCometBFTIdentity(ctx sdk.Context, rootDir string) (validatorIdentity string, err error) {
cfg := cometcfg.DefaultConfig() cfg := cometcfg.DefaultConfig()
jsonFilePath := filepath.Join(rootDir, cfg.PrivValidatorKey) jsonFilePath := filepath.Join(rootDir, cfg.PrivValidatorKey)
jsonFile, err := os.Open(jsonFilePath) jsonFile, err := os.Open(jsonFilePath)
if err != nil { if err != nil {
GetAppLogger().Error(ctx, "error while opening config", err.Error()) GetAppLogger().Error(ctx, "error while opening config", err.Error())
return "", false return
} }
jsonBytes, err := io.ReadAll(jsonFile) jsonBytes, err := io.ReadAll(jsonFile)
if err != nil { if err != nil {
GetAppLogger().Error(ctx, "error while reading file", err.Error()) GetAppLogger().Error(ctx, "error while reading file", err.Error())
return "", false return
} }
var keyFile KeyFile var keyFile KeyFile
err = json.Unmarshal(jsonBytes, &keyFile) err = json.Unmarshal(jsonBytes, &keyFile)
if err != nil { if err != nil {
GetAppLogger().Error(ctx, "error while unmarshaling key file", err.Error()) GetAppLogger().Error(ctx, "error while unmarshaling key file", err.Error())
return "", false return
} }
return strings.ToLower(keyFile.Address), true validatorIdentity = strings.ToLower(keyFile.Address)
return
} }
func IsValidatorBlockProposer(ctx sdk.Context, proposerAddress []byte, rootDir string) bool { func IsValidatorBlockProposer(ctx sdk.Context, proposerAddress []byte, rootDir string) (result bool) {
validatorIdentity, validResult := GetValidatorCometBFTIdentity(ctx, rootDir) validatorIdentity, err := GetValidatorCometBFTIdentity(ctx, rootDir)
if !validResult { if err != nil {
return false return
} }
hexProposerAddress := hex.EncodeToString(proposerAddress) hexProposerAddress := hex.EncodeToString(proposerAddress)
return hexProposerAddress == validatorIdentity result = hexProposerAddress == validatorIdentity
return
} }

9
x/dao/keeper/msg_server_distribution_request.go
View File

@ -28,9 +28,12 @@ func (k msgServer) DistributionRequest(goCtx context.Context, msg *types.MsgDist
util.GetAppLogger().Info(ctx, distributionRequestTag+"storing distribution: "+msg.GetDistribution().String()) util.GetAppLogger().Info(ctx, distributionRequestTag+"storing distribution: "+msg.GetDistribution().String())
k.StoreDistributionOrder(ctx, *msg.GetDistribution()) k.StoreDistributionOrder(ctx, *msg.GetDistribution())
validatorIdentity, validResult := util.GetValidatorCometBFTIdentity(ctx, k.RootDir) validatorIdentity, err := util.GetValidatorCometBFTIdentity(ctx, k.RootDir)
if !validResult || msg.Distribution.GetProposer() != validatorIdentity { if err != nil {
util.GetAppLogger().Info(ctx, distributionRequestTag+"Not the proposer. valid result: %t proposer: %s validator identity: %s", validResult, msg.Distribution.GetProposer(), validatorIdentity) return nil, err
}
if msg.Distribution.GetProposer() != validatorIdentity {
util.GetAppLogger().Info(ctx, distributionRequestTag+"Not the proposer. proposer: %s validator identity: %s", msg.Distribution.GetProposer(), validatorIdentity)
return &types.MsgDistributionRequestResponse{}, nil return &types.MsgDistributionRequestResponse{}, nil
} }

7
x/dao/keeper/msg_server_init_pop.go
View File

@ -19,8 +19,11 @@ func (k msgServer) InitPop(goCtx context.Context, msg *types.MsgInitPop) (*types
k.StoreChallenge(ctx, challenge) k.StoreChallenge(ctx, challenge)
validatorIdentity, validResult := util.GetValidatorCometBFTIdentity(ctx, k.RootDir) validatorIdentity, err := util.GetValidatorCometBFTIdentity(ctx, k.RootDir)
if validResult && msg.Initiator == validatorIdentity { if err != nil {
return nil, err
}
if msg.Initiator == validatorIdentity {
go util.SendMqttPopInitMessagesToServer(ctx, challenge) go util.SendMqttPopInitMessagesToServer(ctx, challenge)
} }

9
x/dao/keeper/msg_server_reissue_rddl_proposal.go
View File

@ -29,9 +29,12 @@ func (k msgServer) ReissueRDDLProposal(goCtx context.Context, msg *types.MsgReis
reissuance.LastIncludedPop = msg.GetLastIncludedPop() reissuance.LastIncludedPop = msg.GetLastIncludedPop()
k.StoreReissuance(ctx, reissuance) k.StoreReissuance(ctx, reissuance)
validatorIdentity, validResult := util.GetValidatorCometBFTIdentity(ctx, k.RootDir) validatorIdentity, err := util.GetValidatorCometBFTIdentity(ctx, k.RootDir)
if !validResult || msg.Proposer != validatorIdentity { if err != nil {
util.GetAppLogger().Info(ctx, reissueTag+"Not the proposer. valid result: %t proposer: %s validator identity: %s", validResult, msg.Proposer, validatorIdentity) return nil, err
}
if msg.Proposer != validatorIdentity {
util.GetAppLogger().Info(ctx, reissueTag+"Not the proposer. proposer: %s validator identity: %s", msg.Proposer, validatorIdentity)
return &types.MsgReissueRDDLProposalResponse{}, nil return &types.MsgReissueRDDLProposalResponse{}, nil
} }