diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-11-15 13:29:48 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 207d24b34b2aa076c009e0b6de3a52895d9707fa (patch) | |
| tree | b0fd2fe550308cd4d66d32e804a011939a1821e8 /dex | |
| parent | a217d3b3be51b38c7d6cf9a606bd7a6d5e9f0f5b (diff) | |
| download | dexon-207d24b34b2aa076c009e0b6de3a52895d9707fa.tar dexon-207d24b34b2aa076c009e0b6de3a52895d9707fa.tar.gz dexon-207d24b34b2aa076c009e0b6de3a52895d9707fa.tar.bz2 dexon-207d24b34b2aa076c009e0b6de3a52895d9707fa.tar.lz dexon-207d24b34b2aa076c009e0b6de3a52895d9707fa.tar.xz dexon-207d24b34b2aa076c009e0b6de3a52895d9707fa.tar.zst dexon-207d24b34b2aa076c009e0b6de3a52895d9707fa.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 60a5ede17..b6a75d2fd 100644 --- a/dex/handler.go +++ b/dex/handler.go @@ -1201,7 +1201,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 |