From 7d2adc383f826c9087d30065a40eb616a7b82a3e Mon Sep 17 00:00:00 2001 From: Ian Davis Date: Thu, 14 Jan 2021 11:29:57 +0000 Subject: [PATCH] chore: export vm.ShouldBurn --- chain/vm/vm.go | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/chain/vm/vm.go b/chain/vm/vm.go index 52af783ad..522bc2298 100644 --- a/chain/vm/vm.go +++ b/chain/vm/vm.go @@ -43,9 +43,11 @@ import ( const MaxCallDepth = 4096 -var log = logging.Logger("vm") -var actorLog = logging.Logger("actors") -var gasOnActorExec = newGasCharge("OnActorExec", 0, 0) +var ( + log = logging.Logger("vm") + actorLog = logging.Logger("actors") + gasOnActorExec = newGasCharge("OnActorExec", 0, 0) +) // stat counters var ( @@ -72,8 +74,10 @@ func ResolveToKeyAddr(state types.StateTree, cst cbor.IpldStore, addr address.Ad return aast.PubkeyAddress() } -var _ cbor.IpldBlockstore = (*gasChargingBlocks)(nil) -var _ blockstore.Viewer = (*gasChargingBlocks)(nil) +var ( + _ cbor.IpldBlockstore = (*gasChargingBlocks)(nil) + _ blockstore.Viewer = (*gasChargingBlocks)(nil) +) type gasChargingBlocks struct { chargeGas func(GasCharge) @@ -194,9 +198,11 @@ func (vm *UnsafeVM) MakeRuntime(ctx context.Context, msg *types.Message) *Runtim return vm.VM.makeRuntime(ctx, msg, nil) } -type CircSupplyCalculator func(context.Context, abi.ChainEpoch, *state.StateTree) (abi.TokenAmount, error) -type NtwkVersionGetter func(context.Context, abi.ChainEpoch) network.Version -type LookbackStateGetter func(context.Context, abi.ChainEpoch) (*state.StateTree, error) +type ( + CircSupplyCalculator func(context.Context, abi.ChainEpoch, *state.StateTree) (abi.TokenAmount, error) + NtwkVersionGetter func(context.Context, abi.ChainEpoch) network.Version + LookbackStateGetter func(context.Context, abi.ChainEpoch) (*state.StateTree, error) +) type VM struct { cstate *state.StateTree @@ -265,7 +271,6 @@ type ApplyRet struct { func (vm *VM) send(ctx context.Context, msg *types.Message, parent *Runtime, gasCharge *GasCharge, start time.Time) ([]byte, aerrors.ActorError, *Runtime) { - defer atomic.AddUint64(&StatSends, 1) st := vm.cstate @@ -563,7 +568,7 @@ func (vm *VM) ApplyMessage(ctx context.Context, cmsg types.ChainMsg) (*ApplyRet, gasUsed = 0 } - burn, err := vm.shouldBurn(st, msg, errcode) + burn, err := vm.ShouldBurn(st, msg, errcode) if err != nil { return nil, xerrors.Errorf("deciding whether should burn failed: %w", err) } @@ -606,7 +611,7 @@ func (vm *VM) ApplyMessage(ctx context.Context, cmsg types.ChainMsg) (*ApplyRet, }, nil } -func (vm *VM) shouldBurn(st *state.StateTree, msg *types.Message, errcode exitcode.ExitCode) (bool, error) { +func (vm *VM) ShouldBurn(st *state.StateTree, msg *types.Message, errcode exitcode.ExitCode) (bool, error) { // Check to see if we should burn funds. We avoid burning on successful // window post. This won't catch _indirect_ window post calls, but this // is the best we can get for now. @@ -737,7 +742,7 @@ func Copy(ctx context.Context, from, to blockstore.Blockstore, root cid.Cid) err close(freeBufs) }() - var batch = <-freeBufs + batch := <-freeBufs batchCp := func(blk block.Block) error { numBlocks++ totalCopySize += len(blk.RawData())