cleanup

Author: janezpodhostnik

Diff for: fvm/environment/meter.go

@@ -55,7 +55,6 @@ const (
 	_
 	ComputationKindEVMEncodeABI
 	ComputationKindEVMDecodeABI
-	ComputationKindMinimumRequiredVersion
 )
 
 // MainnetExecutionEffortWeights are the execution effort weights as they are

Diff for: fvm/executionParameters.go

@@ -65,14 +65,14 @@ func getExecutionParameters(
 	ctx Context,
 	proc Procedure,
 	txnState storage.TransactionPreparer,
-) (meter.ExecutionParameters, *snapshot.ExecutionSnapshot, error) {
+) (state.ExecutionParameters, *snapshot.ExecutionSnapshot, error) {
 	meterParams := getBasicMeterParameters(ctx, proc)
 
 	executionParams, executionParamsStateRead, err := txnState.GetStateExecutionParameters(
 		txnState,
 		NewExecutionParametersComputer(log, ctx, txnState))
 	if err != nil {
-		return meter.ExecutionParameters{
+		return state.ExecutionParameters{
 			MeterParameters:  meterParams,
 			ExecutionVersion: semver.Version{},
 		}, nil, err
@@ -98,7 +98,7 @@ func getExecutionParameters(
 			WithStorageInteractionLimit(math.MaxUint64)
 	}
 
-	return meter.ExecutionParameters{
+	return state.ExecutionParameters{
 		MeterParameters:  meterParams,
 		ExecutionVersion: executionParams.ExecutionVersion,
 	}, executionParamsStateRead, nil

Diff for: fvm/fvm_test.go

@@ -3262,7 +3262,7 @@ func Test_MinimumRequiredVersion(t *testing.T) {
 		// this will set the parameters to the txnState.
 		// this is done at the beginning of a transaction/script
 		txnId, err := txnState.BeginNestedTransactionWithMeterParams(
-			meter.ExecutionParameters{
+			state.ExecutionParameters{
 				ExecutionVersion: executionParams.ExecutionVersion,
 			})
 		require.NoError(t, err)

Diff for: fvm/meter/meter.go

@@ -1,19 +1,12 @@
 package meter
 
-import "github.com/coreos/go-semver/semver"
-
 type MeterParameters struct {
 	ComputationMeterParameters
 	MemoryMeterParameters
 	EventMeterParameters
 	InteractionMeterParameters
 }
 
-type ExecutionParameters struct {
-	MeterParameters
-	ExecutionVersion semver.Version
-}
-
 func DefaultParameters() MeterParameters {
 	return MeterParameters{
 		ComputationMeterParameters: DefaultComputationMeterParameters(),

Diff for: fvm/storage/state/execution_state.go

@@ -43,6 +43,11 @@ type StateParameters struct {
 	maxValueSizeAllowed uint64
 }
 
+type ExecutionParameters struct {
+	meter.MeterParameters
+	ExecutionVersion semver.Version
+}
+
 func DefaultParameters() StateParameters {
 	return StateParameters{
 		MeterParameters:     meter.DefaultParameters(),
@@ -132,7 +137,7 @@ func NewExecutionStateWithSpockStateHasher(
 // NewChildWithMeterParams generates a new child state using the provide meter
 // parameters.
 func (state *ExecutionState) NewChildWithMeterParams(
-	params meter.ExecutionParameters,
+	params ExecutionParameters,
 ) *ExecutionState {
 	return &ExecutionState{
 		finalized:        false,
@@ -341,8 +346,8 @@ func (state *ExecutionState) checkSize(
 	return nil
 }
 
-func (state *ExecutionState) ExecutionParameters() meter.ExecutionParameters {
-	return meter.ExecutionParameters{
+func (state *ExecutionState) ExecutionParameters() ExecutionParameters {
+	return ExecutionParameters{
 		MeterParameters:  state.meter.MeterParameters,
 		ExecutionVersion: state.executionVersion,
 	}

Diff for: fvm/storage/state/transaction_state.go

@@ -45,7 +45,7 @@ type NestedTransactionPreparer interface {
 	Meter
 
 	// ExecutionParameters returns the execution parameters
-	ExecutionParameters() meter.ExecutionParameters
+	ExecutionParameters() ExecutionParameters
 
 	// NumNestedTransactions returns the number of uncommitted nested
 	// transactions.  Note that the main transaction is not considered a
@@ -86,7 +86,7 @@ type NestedTransactionPreparer interface {
 	// the provided meter parameters. This returns error if the current nested
 	// transaction is program restricted.
 	BeginNestedTransactionWithMeterParams(
-		params meter.ExecutionParameters,
+		params ExecutionParameters,
 	) (
 		NestedTransactionId,
 		error,
@@ -202,7 +202,7 @@ func (txnState *transactionState) current() nestedTransactionStackFrame {
 	return txnState.nestedTransactions[txnState.NumNestedTransactions()]
 }
 
-func (txnState *transactionState) ExecutionParameters() meter.ExecutionParameters {
+func (txnState *transactionState) ExecutionParameters() ExecutionParameters {
 	return txnState.current().ExecutionParameters()
 }
 
@@ -273,7 +273,7 @@ func (txnState *transactionState) BeginNestedTransaction() (
 }
 
 func (txnState *transactionState) BeginNestedTransactionWithMeterParams(
-	params meter.ExecutionParameters,
+	params ExecutionParameters,
 ) (
 	NestedTransactionId,
 	error,

Diff for: fvm/storage/state/transaction_state_test.go

@@ -104,7 +104,7 @@ func TestUnrestrictedNestedTransactionDifferentMeterParams(t *testing.T) {
 	require.Equal(t, uint(math.MaxUint), mainState.TotalMemoryLimit())
 
 	id1, err := txn.BeginNestedTransactionWithMeterParams(
-		meter.ExecutionParameters{
+		state.ExecutionParameters{
 			MeterParameters: meter.DefaultParameters().WithMemoryLimit(1),
 		})
 	require.NoError(t, err)
@@ -114,7 +114,7 @@ func TestUnrestrictedNestedTransactionDifferentMeterParams(t *testing.T) {
 	require.Equal(t, uint(1), nestedState1.TotalMemoryLimit())
 
 	id2, err := txn.BeginNestedTransactionWithMeterParams(
-		meter.ExecutionParameters{
+		state.ExecutionParameters{
 			MeterParameters: meter.DefaultParameters().WithMemoryLimit(2),
 		})
 	require.NoError(t, err)

Diff for: module/trace/constants.go

@@ -183,7 +183,6 @@ const (
 	FVMEnvGetBlockAtHeight            SpanName = "fvm.env.getBlockAtHeight"
 	FVMEnvRandom                      SpanName = "fvm.env.unsafeRandom"
 	FVMEnvRandomSourceHistoryProvider SpanName = "fvm.env.randomSourceHistoryProvider"
-	FVMEnvMinimumRequiredVersion      SpanName = "fvm.env.minimumRequiredVersion"
 	FVMEnvCreateAccount               SpanName = "fvm.env.createAccount"
 	FVMEnvAddAccountKey               SpanName = "fvm.env.addAccountKey"
 	FVMEnvAccountKeysCount            SpanName = "fvm.env.accountKeysCount"