diff --git a/chain/actors/manifest.go b/chain/actors/manifest.go index 984c3f1f6..b78c9a83c 100644 --- a/chain/actors/manifest.go +++ b/chain/actors/manifest.go @@ -32,6 +32,22 @@ const ( VerifregKey = "verifiedregistry" ) +func GetBuiltinActorsKeys() []string { + return []string{ + AccountKey, + CronKey, + InitKey, + MarketKey, + MinerKey, + MultisigKey, + PaychKey, + PowerKey, + RewardKey, + SystemKey, + VerifregKey, + } +} + var ( manifestMx sync.RWMutex ) @@ -85,19 +101,8 @@ func loadManifests(ctx context.Context, store cbor.IpldStore) error { manifests[av] = mf - for _, name := range []string{ - AccountKey, - CronKey, - InitKey, - MarketKey, - MinerKey, - MultisigKey, - PaychKey, - PowerKey, - RewardKey, - SystemKey, - VerifregKey, - } { + var actorKeys = GetBuiltinActorsKeys() + for _, name := range actorKeys { c, ok := mf.Get(name) if ok { actorMeta[c] = actorEntry{name: name, version: av} diff --git a/cli/state.go b/cli/state.go index d9df7bce3..db941891d 100644 --- a/cli/state.go +++ b/cli/state.go @@ -1933,19 +1933,8 @@ var StateSysActorCIDsCmd = &cli.Command{ tw := tabwriter.NewWriter(os.Stdout, 2, 4, 2, ' ', 0) _, _ = fmt.Fprintln(tw, "\nActor\tCID\t") - for _, name := range []string{ - actors.AccountKey, - actors.CronKey, - actors.InitKey, - actors.MarketKey, - actors.MinerKey, - actors.MultisigKey, - actors.PaychKey, - actors.PowerKey, - actors.RewardKey, - actors.SystemKey, - actors.VerifregKey, - } { + var actorKeys = actors.GetBuiltinActorsKeys() + for _, name := range actorKeys { sysActorCID, ok := actors.GetActorCodeID(actorVersion, name) if !ok { return xerrors.Errorf("error getting actor %v code id for actor version %d", name,