Merge branch 'release/v1.16.0' into jen/master16

This commit is contained in:
Jennifer Wang 2022-06-16 14:24:44 -04:00
commit 51b6b07110

View File

@ -21,7 +21,7 @@ type Interface interface {
Flush(ctx context.Context) (cid.Cid, error)
}
var experimentalUseFvm = os.Getenv("LOTUS_USE_FVM_TO_SYNC_MAINNET_V15") == "1"
var useFvmForMainnetV15 = os.Getenv("LOTUS_USE_FVM_TO_SYNC_MAINNET_V15") == "1"
func NewVM(ctx context.Context, opts *VMOpts) (Interface, error) {
if opts.NetworkVersion >= network.Version16 {
@ -29,7 +29,7 @@ func NewVM(ctx context.Context, opts *VMOpts) (Interface, error) {
}
// Remove after v16 upgrade, this is only to support testing and validation of the FVM
if experimentalUseFvm && opts.NetworkVersion >= network.Version15 {
if useFvmForMainnetV15 && opts.NetworkVersion >= network.Version15 {
return NewFVM(ctx, opts)
}