aboutsummaryrefslogtreecommitdiffstats
path: root/dex
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2018-11-15 13:29:48 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:54 +0800
commit2ea3e5bc1881de55b6c4a9fe77d735257536d068 (patch)
tree3f92a1ffb0e8df36c8a6e826ad7818c46c045f4e /dex
parent744cee6920b52f55ba35c1b41ad9aea63afd728f (diff)
downloaddexon-2ea3e5bc1881de55b6c4a9fe77d735257536d068.tar
dexon-2ea3e5bc1881de55b6c4a9fe77d735257536d068.tar.gz
dexon-2ea3e5bc1881de55b6c4a9fe77d735257536d068.tar.bz2
dexon-2ea3e5bc1881de55b6c4a9fe77d735257536d068.tar.lz
dexon-2ea3e5bc1881de55b6c4a9fe77d735257536d068.tar.xz
dexon-2ea3e5bc1881de55b6c4a9fe77d735257536d068.tar.zst
dexon-2ea3e5bc1881de55b6c4a9fe77d735257536d068.zip
core: fix tests
Diffstat (limited to 'dex')
-rw-r--r--dex/config.go8
-rw-r--r--dex/handler.go2
2 files changed, 2 insertions, 8 deletions
diff --git a/dex/config.go b/dex/config.go
index b6ce76992..924e18d53 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