diff --git a/build/params_shared_vals.go b/build/params_shared_vals.go index f15cbc35c..0a242f6f2 100644 --- a/build/params_shared_vals.go +++ b/build/params_shared_vals.go @@ -32,11 +32,11 @@ const AllowableClockDriftSecs = uint64(1) const NewestNetworkVersion = network.Version{{.latestNetworkVersion}} -inline-gen start */ +/* inline-gen start */ const NewestNetworkVersion = network.Version14 -//inline-gen end +/* inline-gen end */ // Epochs const ForkLengthThreshold = Finality diff --git a/chain/consensus/filcns/compute_state.go b/chain/consensus/filcns/compute_state.go index 6089f227c..3c333298e 100644 --- a/chain/consensus/filcns/compute_state.go +++ b/chain/consensus/filcns/compute_state.go @@ -20,7 +20,7 @@ import ( {{range .actorVersions}} exported{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin/exported"{{end}} - inline-gen start */ + /* inline-gen start */ exported0 "github.com/filecoin-project/specs-actors/actors/builtin/exported" exported2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/exported" @@ -29,7 +29,7 @@ import ( exported5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/exported" exported6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/exported" - //inline-gen end + /* inline-gen end */ "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" @@ -51,7 +51,7 @@ func NewActorRegistry() *vm.ActorRegistry { {{range .actorVersions}} inv.Register(vm.ActorsVersionPredicate(actors.Version{{.}}), exported{{.}}.BuiltinActors()...){{end}} - inline-gen start */ + /* inline-gen start */ inv.Register(vm.ActorsVersionPredicate(actors.Version0), exported0.BuiltinActors()...) inv.Register(vm.ActorsVersionPredicate(actors.Version2), exported2.BuiltinActors()...) @@ -60,7 +60,7 @@ func NewActorRegistry() *vm.ActorRegistry { inv.Register(vm.ActorsVersionPredicate(actors.Version5), exported5.BuiltinActors()...) inv.Register(vm.ActorsVersionPredicate(actors.Version6), exported6.BuiltinActors()...) - //inline-gen end + /* inline-gen end */ return inv } diff --git a/chain/vm/mkactor.go b/chain/vm/mkactor.go index 19702aa9c..b0d6b454d 100644 --- a/chain/vm/mkactor.go +++ b/chain/vm/mkactor.go @@ -18,7 +18,7 @@ import ( {{range .actorVersions}} builtin{{.}} "github.com/filecoin-project/specs-actors{{import .}}actors/builtin"{{end}} - inline-gen start */ + /* inline-gen start */ builtin0 "github.com/filecoin-project/specs-actors/actors/builtin" builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" @@ -27,7 +27,7 @@ import ( builtin5 "github.com/filecoin-project/specs-actors/v5/actors/builtin" builtin6 "github.com/filecoin-project/specs-actors/v6/actors/builtin" - //inline-gen end + /* inline-gen end */ "github.com/filecoin-project/go-address" "github.com/filecoin-project/lotus/chain/actors/aerrors" @@ -116,7 +116,7 @@ func newAccountActor(ver actors.Version) *types.Actor { {{range .actorVersions}} case actors.Version{{.}}: code = builtin{{.}}.AccountActorCodeID{{end}} - inline-gen start */ + /* inline-gen start */ case actors.Version0: code = builtin0.AccountActorCodeID @@ -130,7 +130,7 @@ func newAccountActor(ver actors.Version) *types.Actor { code = builtin5.AccountActorCodeID case actors.Version6: code = builtin6.AccountActorCodeID - //inline-gen end + /* inline-gen end */ default: panic("unsupported actors version") } diff --git a/gen/inline-gen/main.go b/gen/inline-gen/main.go index 0084bc2f9..2f87afd79 100644 --- a/gen/inline-gen/main.go +++ b/gen/inline-gen/main.go @@ -61,14 +61,14 @@ func main() { case stateTemplate: outLines = append(outLines, line) // output all template lines - if strings.TrimSpace(line) == `inline-gen start */` { + if strings.TrimSpace(line) == `/* inline-gen start */` { state = stateGen fmt.Printf("generated section start %s:%d\n", path, ln) continue } templateLines = append(templateLines, line) case stateGen: - if strings.TrimSpace(line) != `//inline-gen end` { + if strings.TrimSpace(line) != `/* inline-gen end */` { continue } fmt.Printf("generated section end %s:%d\n", path, ln) diff --git a/itests/kit/ensemble_opts_nv.go b/itests/kit/ensemble_opts_nv.go index 7cdf082ee..0d7d87e6a 100644 --- a/itests/kit/ensemble_opts_nv.go +++ b/itests/kit/ensemble_opts_nv.go @@ -47,7 +47,7 @@ func LatestActorsAt(upgradeHeight abi.ChainEpoch) EnsembleOpt { Height: upgradeHeight, Migration: filcns.UpgradeActorsV{{.latestActorsVersion}}, }) - inline-gen start */ + /* inline-gen start */ return UpgradeSchedule(stmgr.Upgrade{ Network: network.Version13, Height: -1, @@ -56,7 +56,7 @@ func LatestActorsAt(upgradeHeight abi.ChainEpoch) EnsembleOpt { Height: upgradeHeight, Migration: filcns.UpgradeActorsV6, }) - //inline-gen end + /* inline-gen end */ } func TurboUpgradeAt(upgradeHeight abi.ChainEpoch) EnsembleOpt {