diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-11-15 13:29:48 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
| commit | 3739c30a78860421f8db52a58f1644eeeaf7fe4c (patch) | |
| tree | f32a6418e27ebf3cc983576db78482010760444c /dex | |
| parent | 9d6136f800d76956c424449185a39c936f8284be (diff) | |
| download | dexon-3739c30a78860421f8db52a58f1644eeeaf7fe4c.tar dexon-3739c30a78860421f8db52a58f1644eeeaf7fe4c.tar.gz dexon-3739c30a78860421f8db52a58f1644eeeaf7fe4c.tar.bz2 dexon-3739c30a78860421f8db52a58f1644eeeaf7fe4c.tar.lz dexon-3739c30a78860421f8db52a58f1644eeeaf7fe4c.tar.xz dexon-3739c30a78860421f8db52a58f1644eeeaf7fe4c.tar.zst dexon-3739c30a78860421f8db52a58f1644eeeaf7fe4c.zip | |
core: fix tests
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/config.go | 8 | ||||
| -rw-r--r-- | dex/handler.go | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/dex/config.go b/dex/config.go index 4505ff59c..5fa7d87e8 100644 --- a/dex/config.go +++ b/dex/config.go @@ -48,9 +48,6 @@ var DefaultConfig = Config{ }, BlockProposerEnabled: false, DefaultGasPrice: big.NewInt(params.GWei), - GasFloor: 80000000, - GasCeil: 80000000, - GasLimitTolerance: 1000000, } func init() { @@ -96,10 +93,7 @@ type Config struct { TrieTimeout time.Duration // For calculate gas limit - DefaultGasPrice *big.Int - GasFloor uint64 - GasCeil uint64 - GasLimitTolerance uint64 + DefaultGasPrice *big.Int // Transaction pool options TxPool core.TxPoolConfig diff --git a/dex/handler.go b/dex/handler.go index fe48c455b..6260d9be8 100644 --- a/dex/handler.go +++ b/dex/handler.go @@ -1206,7 +1206,7 @@ func (pm *ProtocolManager) peerSetLoop() { // NodeInfo represents a short summary of the Ethereum sub-protocol metadata // known about the host peer. type NodeInfo struct { - Network uint64 `json:"network"` // Ethereum network ID (1=Frontier, 2=Morden, Ropsten=3, Rinkeby=4) + Network uint64 `json:"network"` // DEXON network ID (237=Mainnet, 238=Taiwan, 239=Taipei) Difficulty *big.Int `json:"difficulty"` // Total difficulty of the host's blockchain Genesis common.Hash `json:"genesis"` // SHA3 hash of the host's genesis block Config *params.ChainConfig `json:"config"` // Chain configuration for the fork rules |