Cover instructions with unit tests (#64)

* some tests added * more unit tests * lint fix * lint again * more tests * lint fix * test fix * lint fix * more tests * better code, lint fix * more tests * lint fix * more cases * Rename opMload to opMLoad * comments fix * mstore test fix * less code * lint fix * lint * nolint fix * more lint fix * forcetypeassertfix * typeassert * lint * comments fix * more comment fix * missed cast of mockHost * Remove evm reference from the state * Minor changes * Remove TestReleaseAcquireBig as it is tested with TestExp and TestSignExtension * Fix TestBalance --------- Co-authored-by: Stefan Negovanović <[email protected]>
Ethernal-Tech · Jan 12, 2024 · 0d68f22 · 0d68f22
1 parent f4176d4
commit 0d68f22
Show file tree

Hide file tree

Showing 7 changed files with 1,347 additions and 95 deletions.
diff --git a/state/runtime/evm/dispatch_table.go b/state/runtime/evm/dispatch_table.go
@@ -79,7 +79,7 @@ func init() {
 	register(RETURN, handler{inst: opHalt(RETURN), stack: 2, gas: 0})
 
 	// memory
-	register(MLOAD, handler{inst: opMload, stack: 1, gas: 3})
+	register(MLOAD, handler{inst: opMLoad, stack: 1, gas: 3})
 	register(MSTORE, handler{inst: opMStore, stack: 2, gas: 3})
 	register(MSTORE8, handler{inst: opMStore8, stack: 2, gas: 3})
 

diff --git a/state/runtime/evm/evm.go b/state/runtime/evm/evm.go
@@ -35,7 +35,6 @@ func (e *EVM) Run(c *runtime.Contract, host runtime.Host, config *chain.ForksInT
 
 	contract.msg = c
 	contract.code = c.Code
-	contract.evm = e
 	contract.gas = c.Gas
 	contract.host = host
 	contract.config = config

diff --git a/state/runtime/evm/evm_test.go b/state/runtime/evm/evm_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/0xPolygon/polygon-edge/state/runtime/tracer"
 	"github.com/0xPolygon/polygon-edge/types"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
 func newMockContract(value *big.Int, gas uint64, code []byte) *runtime.Contract {
@@ -26,6 +27,8 @@ func newMockContract(value *big.Int, gas uint64, code []byte) *runtime.Contract
 // mockHost is a struct which meets the requirements of runtime.Host interface but throws panic in each methods
 // we don't test all opcodes in this test
 type mockHost struct {
+	mock.Mock
+
 	tracer runtime.VMTracer
 }
 
@@ -34,7 +37,9 @@ func (m *mockHost) AccountExists(addr types.Address) bool {
 }
 
 func (m *mockHost) GetStorage(addr types.Address, key types.Hash) types.Hash {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called()
+
+	return args.Get(0).(types.Hash) //nolint:forcetypeassert
 }
 
 func (m *mockHost) SetState(
@@ -51,51 +56,67 @@ func (m *mockHost) SetStorage(
 	value types.Hash,
 	config *chain.ForksInTime,
 ) runtime.StorageStatus {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called()
+
+	return args.Get(0).(runtime.StorageStatus) //nolint:forcetypeassert
 }
 
 func (m *mockHost) SetNonPayable(bool) {
 	panic("Not implemented in tests") //nolint:gocritic
 }
 
 func (m *mockHost) GetBalance(addr types.Address) *big.Int {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called(addr)
+
+	return args.Get(0).(*big.Int) //nolint:forcetypeassert
 }
 
 func (m *mockHost) GetCodeSize(addr types.Address) int {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called(addr)
+
+	return args.Int(0)
 }
 
 func (m *mockHost) GetCodeHash(addr types.Address) types.Hash {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called(addr)
+
+	return types.StringToHash(args.String(0))
 }
 
 func (m *mockHost) GetCode(addr types.Address) []byte {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called(addr)
+
+	return types.StringToBytes(args.String(0))
 }
 
 func (m *mockHost) Selfdestruct(addr types.Address, beneficiary types.Address) {
-	panic("Not implemented in tests") //nolint:gocritic
+	m.Called()
 }
 
 func (m *mockHost) GetTxContext() runtime.TxContext {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called()
+
+	return args.Get(0).(runtime.TxContext) //nolint:forcetypeassert
 }
 
 func (m *mockHost) GetBlockHash(number int64) types.Hash {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called(number)
+
+	return args.Get(0).(types.Hash) //nolint:forcetypeassert
 }
 
 func (m *mockHost) EmitLog(addr types.Address, topics []types.Hash, data []byte) {
-	panic("Not implemented in tests") //nolint:gocritic
+	m.Called()
 }
 
 func (m *mockHost) Callx(*runtime.Contract, runtime.Host) *runtime.ExecutionResult {
 	panic("Not implemented in tests") //nolint:gocritic
 }
 
 func (m *mockHost) Empty(addr types.Address) bool {
-	panic("Not implemented in tests") //nolint:gocritic
+	args := m.Called(addr)
+
+	return args.Bool(0)
 }
 
 func (m *mockHost) GetNonce(addr types.Address) uint64 {

diff --git a/state/runtime/evm/instructions.go b/state/runtime/evm/instructions.go
@@ -397,7 +397,7 @@ var bufPool = sync.Pool{
 	},
 }
 
-func opMload(c *state) {
+func opMLoad(c *state) {
 	offset := c.pop()
 
 	var ok bool