From d9382bd0ee655e10ff3108983e5a98d30e058868 Mon Sep 17 00:00:00 2001
From: BJ4 <bojie@dexon.org>
Date: Fri, 9 Nov 2018 12:08:17 +0800
Subject: app: fix core test

---
 core/evm.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'core/evm.go')

diff --git a/core/evm.go b/core/evm.go
index 7e25e1d52..5e8cf9063 100644
--- a/core/evm.go
+++ b/core/evm.go
@@ -18,6 +18,7 @@ package core
 
 import (
 	"math/big"
+	"reflect"
 	"sync"
 
 	"github.com/dexon-foundation/dexon/common"
@@ -48,6 +49,12 @@ func NewEVMContext(msg Message, header *types.Header, chain ChainContext, author
 	} else {
 		beneficiary = *author
 	}
+
+	var roundHeight sync.Map
+	if !reflect.ValueOf(chain).IsNil() {
+		roundHeight = chain.GetRoundHeightMap()
+	}
+
 	return vm.Context{
 		CanTransfer: CanTransfer,
 		Transfer:    Transfer,
@@ -58,7 +65,7 @@ func NewEVMContext(msg Message, header *types.Header, chain ChainContext, author
 		Time:        new(big.Int).SetUint64(header.Time),
 		Randomness:  header.Randomness,
 		Difficulty:  new(big.Int).Set(header.Difficulty),
-		RoundHeight: chain.GetRoundHeightMap(),
+		RoundHeight: roundHeight,
 		GasLimit:    header.GasLimit,
 		GasPrice:    new(big.Int).Set(msg.GasPrice()),
 	}
-- 
cgit v1.2.3