Refactor and fix lint

bbq/compiler/compiler.go

@@ -411,11 +411,7 @@ func (c *Compiler) exportConstants() []*bbq.Constant {
 }
 
 func (c *Compiler) exportTypes() [][]byte {
-	types := make([][]byte, len(c.staticTypes))
-	for index, typeBytes := range c.staticTypes {
-		types[index] = typeBytes
-	}
-	return types
+	return c.staticTypes
 }
 
 func (c *Compiler) exportImports() []*bbq.Import {
@@ -645,8 +641,15 @@ func (c *Compiler) VisitSwapStatement(_ *ast.SwapStatement) (_ struct{}) {
 
 func (c *Compiler) VisitExpressionStatement(statement *ast.ExpressionStatement) (_ struct{}) {
 	c.compileExpression(statement.Expression)
-	// Drop the expression evaluation result
-	c.emit(opcode.Drop)
+
+	switch statement.Expression.(type) {
+	case *ast.DestroyExpression:
+		// Do nothing. Destroy operation will not produce any result.
+	default:
+		// Otherwise, drop the expression evaluation result.
+		c.emit(opcode.Drop)
+	}
+
 	return
 }
 
@@ -748,11 +751,11 @@ func (c *Compiler) VisitInvocationExpression(expression *ast.InvocationExpressio
 
 	switch invokedExpr := expression.InvokedExpression.(type) {
 	case *ast.IdentifierExpression:
-		typ := c.Elaboration.IdentifierInInvocationType(invokedExpr)
-		invocationType := typ.(*sema.FunctionType)
-		if invocationType.IsConstructor {
-			// TODO:
-		}
+		// TODO: Does constructors need any special handling?
+		//typ := c.Elaboration.IdentifierInInvocationType(invokedExpr)
+		//invocationType := typ.(*sema.FunctionType)
+		//if invocationType.IsConstructor {
+		//}
 
 		// Load arguments
 		c.loadArguments(expression)

bbq/vm/test/ft_test.go

@@ -140,7 +140,7 @@ func TestFTTransfer(t *testing.T) {
 
 	mintTxArgs := []vm.Value{
 		vm.AddressValue(senderAddress),
-		vm.IntValue{total},
+		vm.NewIntValue(total),
 	}
 
 	mintTxAuthorizer := vm.NewAuthAccountReferenceValue(vmConfig, contractsAddress)
@@ -158,7 +158,7 @@ func TestFTTransfer(t *testing.T) {
 	transferAmount := int64(1)
 
 	tokenTransferTxArgs := []vm.Value{
-		vm.IntValue{transferAmount},
+		vm.NewIntValue(transferAmount),
 		vm.AddressValue(receiverAddress),
 	}
 
@@ -183,9 +183,9 @@ func TestFTTransfer(t *testing.T) {
 		require.Equal(t, 0, validationScriptVM.StackSize())
 
 		if address == senderAddress {
-			assert.Equal(t, vm.IntValue{total - transferAmount}, result)
+			assert.Equal(t, vm.NewIntValue(total-transferAmount), result)
 		} else {
-			assert.Equal(t, vm.IntValue{transferAmount}, result)
+			assert.Equal(t, vm.NewIntValue(transferAmount), result)
 		}
 	}
 }
@@ -292,7 +292,7 @@ func BenchmarkFTTransfer(b *testing.B) {
 
 	mintTxArgs := []vm.Value{
 		vm.AddressValue(senderAddress),
-		vm.IntValue{total},
+		vm.NewIntValue(total),
 	}
 
 	mintTxAuthorizer := vm.NewAuthAccountReferenceValue(vmConfig, contractsAddress)
@@ -305,7 +305,7 @@ func BenchmarkFTTransfer(b *testing.B) {
 	transferAmount := int64(1)
 
 	tokenTransferTxArgs := []vm.Value{
-		vm.IntValue{transferAmount},
+		vm.NewIntValue(transferAmount),
 		vm.AddressValue(receiverAddress),
 	}
 

bbq/vm/test/vm_bench_test.go

@@ -35,13 +35,13 @@ func BenchmarkRecursionFib(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()
 
-	expected := vm.IntValue{SmallInt: 377}
+	expected := vm.NewIntValue(377)
 
 	for i := 0; i < b.N; i++ {
 
 		result, err := vmInstance.Invoke(
 			"fib",
-			vm.IntValue{SmallInt: 14},
+			vm.NewIntValue(14),
 		)
 		require.NoError(b, err)
 		require.Equal(b, expected, result)
@@ -64,7 +64,7 @@ func BenchmarkImperativeFib(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()
 
-	var value vm.Value = vm.IntValue{SmallInt: 14}
+	var value vm.Value = vm.NewIntValue(14)
 
 	for i := 0; i < b.N; i++ {
 		_, err := vmInstance.Invoke("fib", value)
@@ -97,7 +97,7 @@ func BenchmarkNewStruct(b *testing.B) {
   `)
 	require.NoError(b, err)
 
-	value := vm.IntValue{SmallInt: 1}
+	value := vm.NewIntValue(1)
 
 	b.ReportAllocs()
 	b.ResetTimer()
@@ -140,7 +140,7 @@ func BenchmarkNewResource(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()
 
-	value := vm.IntValue{SmallInt: 9}
+	value := vm.NewIntValue(9)
 
 	scriptLocation := runtime_utils.NewScriptLocationGenerator()
 
@@ -162,7 +162,7 @@ func BenchmarkNewStructRaw(b *testing.B) {
 		Storage: storage,
 	}
 
-	fieldValue := vm.IntValue{SmallInt: 7}
+	fieldValue := vm.NewIntValue(7)
 
 	b.ReportAllocs()
 	b.ResetTimer()
@@ -239,7 +239,7 @@ func BenchmarkContractImport(b *testing.B) {
 	b.ResetTimer()
 	b.ReportAllocs()
 
-	value := vm.IntValue{SmallInt: 7}
+	value := vm.NewIntValue(7)
 
 	for i := 0; i < b.N; i++ {
 		checker, err := ParseAndCheckWithOptions(b, `
@@ -367,7 +367,7 @@ func BenchmarkMethodCall(b *testing.B) {
 
 		vmInstance = vm.NewVM(scriptLocation(), program, vmConfig)
 
-		value := vm.IntValue{SmallInt: 10}
+		value := vm.NewIntValue(10)
 
 		b.ResetTimer()
 		b.ReportAllocs()
@@ -461,7 +461,7 @@ func BenchmarkMethodCall(b *testing.B) {
 
 		vmInstance = vm.NewVM(scriptLocation(), program, vmConfig)
 
-		value := vm.IntValue{SmallInt: 10}
+		value := vm.NewIntValue(10)
 
 		b.ResetTimer()
 		b.ReportAllocs()