cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Review fixes

Browse Source
This commit is contained in:
Geoff Stuart 2022-09-14 17:38:01 -04:00
parent 84fd51ff50
commit 3c19328764
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/lotus-miner/actor.go
View File

@ -1006,7 +1006,7 @@ var actorProposeChangeBeneficiary = &cli.Command{
}
if !cctx.Bool("really-do-it") {
fmt.Println("Pass --really-do-it to actually execute this action")
fmt.Println("Pass --really-do-it to actually execute this action. Review what you're about to approve CAREFULLY please")
return nil
}
@ -1050,7 +1050,7 @@ var actorProposeChangeBeneficiary = &cli.Command{
return xerrors.Errorf("getting miner info: %w", err)
}
if updatedMinerInfo.PendingBeneficiaryTerm == nil {
if updatedMinerInfo.PendingBeneficiaryTerm == nil && updatedMinerInfo.Beneficiary == newAddr {
fmt.Println("Beneficiary address successfully changed")
} else {
fmt.Println("Beneficiary address change awaiting additional confirmations")
@ -1210,7 +1210,7 @@ var actorConfirmChangeBeneficiary = &cli.Command{
}
if (cctx.IsSet("existing-beneficiary") && cctx.IsSet("new-beneficiary")) || (!cctx.IsSet("existing-beneficiary") && !cctx.IsSet("new-beneficiary")) {
return lcli.ShowHelp(cctx, fmt.Errorf("must pass exactly one of --existing-beneficiary or --existing-beneficiary"))
return lcli.ShowHelp(cctx, fmt.Errorf("must pass exactly one of --existing-beneficiary or --new-beneficiary"))
}
var fromAddr address.Address
@ -1232,7 +1232,7 @@ var actorConfirmChangeBeneficiary = &cli.Command{
fmt.Println("Expiration Epoch:", mi.PendingBeneficiaryTerm.NewExpiration)
if !cctx.Bool("really-do-it") {
fmt.Println("Pass --really-do-it to actually execute this action")
fmt.Println("Pass --really-do-it to actually execute this action. Review what you're about to approve CAREFULLY please")
return nil
}
@ -1268,7 +1268,7 @@ var actorConfirmChangeBeneficiary = &cli.Command{
// check it executed successfully
if wait.Receipt.ExitCode.IsError() {
return fmt.Errorf("confirm beneficiary change failed")
return fmt.Errorf("confirm beneficiary change failed with code %d", wait.Receipt.ExitCode)
}
updatedMinerInfo, err := api.StateMinerInfo(ctx, maddr, types.EmptyTSK)
@ -1276,7 +1276,7 @@ var actorConfirmChangeBeneficiary = &cli.Command{
return err
}
if updatedMinerInfo.PendingBeneficiaryTerm == nil {
if updatedMinerInfo.PendingBeneficiaryTerm == nil && updatedMinerInfo.Beneficiary == mi.PendingBeneficiaryTerm.NewBeneficiary {
fmt.Println("Beneficiary address successfully changed")
} else {
fmt.Println("Beneficiary address change awaiting additional confirmations")

10
cmd/lotus-shed/miner-multisig.go
View File

@ -541,7 +541,7 @@ var mmProposeChangeBeneficiary = &cli.Command{
}
if !cctx.Bool("really-do-it") {
fmt.Println("Pass --really-do-it to actually execute this action")
fmt.Println("Pass --really-do-it to actually execute this action. Review what you're about to approve CAREFULLY please")
return nil
}
@ -705,7 +705,7 @@ var mmConfirmChangeBeneficiary = &cli.Command{
fmt.Println("Expiration Epoch:", mi.PendingBeneficiaryTerm.NewExpiration)
if !cctx.Bool("really-do-it") {
fmt.Println("Pass --really-do-it to actually execute this action")
fmt.Println("Pass --really-do-it to actually execute this action. Review what you're about to approve CAREFULLY please")
return nil
}
@ -734,8 +734,8 @@ var mmConfirmChangeBeneficiary = &cli.Command{
}
// check it executed successfully
if wait.Receipt.ExitCode != 0 {
return fmt.Errorf("confirm beneficiary change failed")
if wait.Receipt.ExitCode.IsError() {
return fmt.Errorf("confirm beneficiary change failed with code %d", wait.Receipt.ExitCode)
}
updatedMinerInfo, err := api.StateMinerInfo(ctx, minerAddr, types.EmptyTSK)
@ -743,7 +743,7 @@ var mmConfirmChangeBeneficiary = &cli.Command{
return err
}
if updatedMinerInfo.PendingBeneficiaryTerm == nil {
if updatedMinerInfo.PendingBeneficiaryTerm == nil && updatedMinerInfo.Beneficiary == mi.PendingBeneficiaryTerm.NewBeneficiary {
fmt.Println("Beneficiary address successfully changed")
} else {
fmt.Println("Beneficiary address change awaiting additional confirmations")