update gas usage for hooks

Author: laurci

vmhost/vmhooks/manBufOps.go

@@ -567,7 +567,6 @@ func (context *VMHooksImpl) MBufferFromBigIntSigned(mBufferHandle int32, bigIntH
 func (context *VMHooksImpl) MBufferToSmallIntUnsigned(mBufferHandle int32) int64 {
 	managedType := context.GetManagedTypesContext()
 	metering := context.GetMeteringContext()
-	enableEpochsHandler := context.GetEnableEpochsHandler()
 
 	gasToUse := metering.GasSchedule().ManagedBufferAPICost.MBufferToSmallIntUnsigned
 	err := metering.UseGasBoundedAndAddTracedGas(mBufferToSmallIntUnsignedName, gasToUse)
@@ -582,13 +581,11 @@ func (context *VMHooksImpl) MBufferToSmallIntUnsigned(mBufferHandle int32) int64
 		return 1
 	}
 
-	if enableEpochsHandler.IsFlagEnabled(vmhost.BarnardOpcodesFlag) {
-		gasToUse = math.MulUint64(metering.GasSchedule().BaseOperationCost.DataCopyPerByte, uint64(len(data)))
-		err = metering.UseGasBounded(gasToUse)
-		if err != nil {
-			context.FailExecution(err)
-			return 1
-		}
+	gasToUse = math.MulUint64(metering.GasSchedule().BaseOperationCost.DataCopyPerByte, uint64(len(data)))
+	err = metering.UseGasBounded(gasToUse)
+	if err != nil {
+		context.FailExecution(err)
+		return 1
 	}
 
 	bigInt := big.NewInt(0).SetBytes(data)
@@ -604,7 +601,6 @@ func (context *VMHooksImpl) MBufferToSmallIntUnsigned(mBufferHandle int32) int64
 func (context *VMHooksImpl) MBufferToSmallIntSigned(mBufferHandle int32) int64 {
 	managedType := context.GetManagedTypesContext()
 	metering := context.GetMeteringContext()
-	enableEpochsHandler := context.GetEnableEpochsHandler()
 
 	gasToUse := metering.GasSchedule().ManagedBufferAPICost.MBufferToSmallIntSigned
 	err := metering.UseGasBoundedAndAddTracedGas(mBufferToSmallIntSignedName, gasToUse)
@@ -619,13 +615,11 @@ func (context *VMHooksImpl) MBufferToSmallIntSigned(mBufferHandle int32) int64 {
 		return 1
 	}
 
-	if enableEpochsHandler.IsFlagEnabled(vmhost.BarnardOpcodesFlag) {
-		gasToUse = math.MulUint64(metering.GasSchedule().BaseOperationCost.DataCopyPerByte, uint64(len(data)))
-		err = metering.UseGasBounded(gasToUse)
-		if err != nil {
-			context.FailExecution(err)
-			return 1
-		}
+	gasToUse = math.MulUint64(metering.GasSchedule().BaseOperationCost.DataCopyPerByte, uint64(len(data)))
+	err = metering.UseGasBounded(gasToUse)
+	if err != nil {
+		context.FailExecution(err)
+		return 1
 	}
 
 	bigInt := twos.SetBytes(big.NewInt(0), data)

vmhost/vmhookstest/manBuffers_test.go

@@ -365,12 +365,6 @@ func TestManBuffers_Ints_WithNoBarnardOpcodesFlag(t *testing.T) {
 						assert.Nil(t, err)
 						assert.True(t, bigIntResult.Cmp(big.NewInt(0x00_ff_00_ff_00_ff_00_ff)) == 0)
 
-						smallInt := hooks.MBufferToSmallIntSigned(sourceBuffer)
-						assert.True(t, smallInt == 0x00_ff_00_ff_00_ff_00_ff)
-
-						smallInt = hooks.MBufferToSmallIntUnsigned(sourceBuffer)
-						assert.True(t, smallInt == 0x00_ff_00_ff_00_ff_00_ff)
-
 						return instance
 					})
 				})).
@@ -387,8 +381,8 @@ func TestManBuffers_Ints_WithNoBarnardOpcodesFlag(t *testing.T) {
 		}).
 		AndAssertResults(func(world *worldmock.MockWorld, verify *test.VMOutputVerifier) {
 			verify.Ok().
-				GasRemaining(gasProvided-37).
-				GasUsed(test.ParentAddress, 37)
+				GasRemaining(gasProvided-35).
+				GasUsed(test.ParentAddress, 35)
 		})
 	assert.Nil(t, err)
 }