diff options
| author | Jhih-Ming Huang <jm.huang@cobinhood.com> | 2019-02-19 11:26:49 +0800 |
|---|---|---|
| committer | Jhih-Ming Huang <jm.huang@cobinhood.com> | 2019-03-26 17:48:21 +0800 |
| commit | 33eb47ad23cdc3d8e65a2d23d1006607a902c7f9 (patch) | |
| tree | 32d74c7b8d147c4c92529acbe818b88c42528583 /consensus | |
| parent | 42b72399fd5c7321a926b3b1dcf337de94cab6c7 (diff) | |
| download | dexon-33eb47ad23cdc3d8e65a2d23d1006607a902c7f9.tar dexon-33eb47ad23cdc3d8e65a2d23d1006607a902c7f9.tar.gz dexon-33eb47ad23cdc3d8e65a2d23d1006607a902c7f9.tar.bz2 dexon-33eb47ad23cdc3d8e65a2d23d1006607a902c7f9.tar.lz dexon-33eb47ad23cdc3d8e65a2d23d1006607a902c7f9.tar.xz dexon-33eb47ad23cdc3d8e65a2d23d1006607a902c7f9.tar.zst dexon-33eb47ad23cdc3d8e65a2d23d1006607a902c7f9.zip | |
core: rebase dev and fix lint
Diffstat (limited to 'consensus')
| -rw-r--r-- | consensus/dexcon/fake_dexcon.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/consensus/dexcon/fake_dexcon.go b/consensus/dexcon/fake_dexcon.go index ae7bed90e..3a9723637 100644 --- a/consensus/dexcon/fake_dexcon.go +++ b/consensus/dexcon/fake_dexcon.go @@ -17,7 +17,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" ) @@ -148,7 +148,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), |