From 156e8c3e6a06a7ba3fc35ac7dd1162493090ce29 Mon Sep 17 00:00:00 2001 From: Jhih-Ming Huang Date: Tue, 19 Feb 2019 11:26:49 +0800 Subject: core: rebase dev and fix lint --- consensus/dexcon/fake_dexcon.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'consensus') diff --git a/consensus/dexcon/fake_dexcon.go b/consensus/dexcon/fake_dexcon.go index 430d9bc6b..befda7514 100644 --- a/consensus/dexcon/fake_dexcon.go +++ b/consensus/dexcon/fake_dexcon.go @@ -16,7 +16,7 @@ import ( "github.com/dexon-foundation/dexon/common" "github.com/dexon-foundation/dexon/consensus" "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/dexon-foundation/dexon/core/vm/evm" "github.com/dexon-foundation/dexon/crypto" "github.com/dexon-foundation/dexon/rlp" ) @@ -140,7 +140,7 @@ func (n *Node) DKGFinalize(round uint64) *coreTypesDKG.Finalize { func (n *Node) CreateGovTx(nonce uint64, data []byte) *types.Transaction { tx, err := types.SignTx(types.NewTransaction( nonce, - vm.GovernanceContractAddress, + evm.GovernanceContractAddress, big.NewInt(0), uint64(2000000), big.NewInt(1e10), -- cgit v1.2.3