From 4626fa2ddab44c67b68328f938797dd8c07405ba Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Thu, 23 Feb 2017 22:36:04 +0000
Subject: [PATCH] Update config for 0.8.0
---
consensus/tendermint/config.go | 18 +++++++++++++++---
rpc/tendermint/test/common_test.go | 1 +
rpc/tendermint/test/rpc_client_test.go | 1 +
rpc/tendermint/test/websocket_client_test.go | 1 +
util/snatives/templates/solidity_templates.go | 4 +---
5 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/consensus/tendermint/config.go b/consensus/tendermint/config.go
index c55115f7..4d9fe841 100644
--- a/consensus/tendermint/config.go
+++ b/consensus/tendermint/config.go
@@ -51,6 +51,11 @@ func GetTendermintConfig(loadedConfig *viper.Viper) *TendermintConfig {
//------------------------------------------------------------------------------
// Tendermint defaults
+//
+// Contract
+//
+
+
func (tmintConfig *TendermintConfig) AssertTendermintDefaults(chainId, workDir,
dataDir, rootDir string) {
@@ -64,6 +69,8 @@ func (tmintConfig *TendermintConfig) AssertTendermintDefaults(chainId, workDir,
tmintConfig.SetDefault("fast_sync", true)
tmintConfig.SetDefault("skip_upnp", false)
tmintConfig.SetDefault("addrbook_file", path.Join(rootDir, "addrbook.json"))
+ tmintConfig.SetDefault("addrbook_strict", true) // disable to allow connections locally
+ tmintConfig.SetDefault("pex_reactor", false) // enable for peer exchange
tmintConfig.SetDefault("priv_validator_file", path.Join(rootDir, "priv_validator.json"))
tmintConfig.SetDefault("db_backend", "leveldb")
tmintConfig.SetDefault("db_dir", dataDir)
@@ -71,10 +78,12 @@ func (tmintConfig *TendermintConfig) AssertTendermintDefaults(chainId, workDir,
tmintConfig.SetDefault("rpc_laddr", "")
tmintConfig.SetDefault("prof_laddr", "")
tmintConfig.SetDefault("revision_file", path.Join(workDir, "revision"))
- tmintConfig.SetDefault("cswal", path.Join(dataDir, "cswal"))
- tmintConfig.SetDefault("cswal_light", false)
+ tmintConfig.SetDefault("cs_wal_dir", path.Join(dataDir,"cs.wal"))
+ tmintConfig.SetDefault("cs_wal_light", false)
+ tmintConfig.SetDefault("filter_peers", false)
- tmintConfig.SetDefault("block_size", 10000)
+ tmintConfig.SetDefault("block_size", 10000) // max number of txs
+ tmintConfig.SetDefault("block_part_size", 65536) // part size 64K
tmintConfig.SetDefault("disable_data_hash", false)
tmintConfig.SetDefault("timeout_propose", 3000)
tmintConfig.SetDefault("timeout_propose_delta", 500)
@@ -83,9 +92,12 @@ func (tmintConfig *TendermintConfig) AssertTendermintDefaults(chainId, workDir,
tmintConfig.SetDefault("timeout_precommit", 1000)
tmintConfig.SetDefault("timeout_precommit_delta", 500)
tmintConfig.SetDefault("timeout_commit", 1000)
+ // make progress asap (no `timeout_commit`) on full precommit votes
+ tmintConfig.SetDefault("skip_timeout_commit", false)
tmintConfig.SetDefault("mempool_recheck", true)
tmintConfig.SetDefault("mempool_recheck_empty", true)
tmintConfig.SetDefault("mempool_broadcast", true)
+ tmintConfig.SetDefault("mempool_wal_dir", path.Join(dataDir, "mempool.wal"))
}
//------------------------------------------------------------------------------
diff --git a/rpc/tendermint/test/common_test.go b/rpc/tendermint/test/common_test.go
index 0ffdc1bf..5b2a1455 100644
--- a/rpc/tendermint/test/common_test.go
+++ b/rpc/tendermint/test/common_test.go
@@ -1,3 +1,4 @@
+// +build integration
// Space above here matters
// Copyright 2017 Monax Industries Limited
diff --git a/rpc/tendermint/test/rpc_client_test.go b/rpc/tendermint/test/rpc_client_test.go
index 7f5e9f8e..ed75ff02 100644
--- a/rpc/tendermint/test/rpc_client_test.go
+++ b/rpc/tendermint/test/rpc_client_test.go
@@ -1,3 +1,4 @@
+// +build integration
// Space above here matters
// Copyright 2017 Monax Industries Limited
diff --git a/rpc/tendermint/test/websocket_client_test.go b/rpc/tendermint/test/websocket_client_test.go
index da0771ff..5f799041 100644
--- a/rpc/tendermint/test/websocket_client_test.go
+++ b/rpc/tendermint/test/websocket_client_test.go
@@ -1,3 +1,4 @@
+// +build integration
// Space above here matters
// Copyright 2017 Monax Industries Limited
diff --git a/util/snatives/templates/solidity_templates.go b/util/snatives/templates/solidity_templates.go
index cc6cabd2..eda2c555 100644
--- a/util/snatives/templates/solidity_templates.go
+++ b/util/snatives/templates/solidity_templates.go
@@ -157,12 +157,10 @@ func (function *solidityFunction) solidity(indentLevel uint) (string, error) {
return buf.String(), nil
}
-
//
-// Contract
+// Utility
//
-
func comment(comment string) string {
commentLines := make([]string, 0, 5)
for _, line := range strings.Split(comment, "\n") {
--
GitLab