From aa225124ab4f3d6b2639daf47c29c90ee49acf26 Mon Sep 17 00:00:00 2001
From: "Ching-Hua (Vivian) Lin" <jkrvivian@gmail.com>
Date: Tue, 30 Jun 2020 02:05:54 +0800
Subject: [PATCH] Update config.default.json (#575)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Update config.default.json
* fix: Remove parameters with default values
* Update config.default.json
* Update config.default.json
* ♻️ Remove unused CfgOutboundUpdateIntervalMs param
Co-authored-by: Angelo Capossele <angelocapossele@gmail.com>
---
config.default.json | 15 +++++++++++++--
plugins/autopeering/parameters.go | 4 ----
.../integration-tests/tester/framework/docker.go | 1 -
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/config.default.json b/config.default.json
index c302c4d3..da3c2d6f 100644
--- a/config.default.json
+++ b/config.default.json
@@ -27,7 +27,8 @@
}
},
"database": {
- "directory": "mainnetdb"
+ "directory": "mainnetdb",
+ "inMemory": false
},
"drng": {
"instanceId": 1,
@@ -35,6 +36,9 @@
"distributedPubKey": "",
"committeeMembers": []
},
+ "fpc": {
+ "bindAddress": "0.0.0.0:10895"
+ },
"gossip": {
"port": 14666
},
@@ -49,9 +53,13 @@
],
"disableEvents": true,
"remotelog": {
- "serverAddress": "remotelog.goshimmer.iota.cafe:5213"
+ "serverAddress": "ressims.iota.cafe:5213"
}
},
+ "metrics": {
+ "local": true,
+ "global": false
+ },
"network": {
"bindAddress": "0.0.0.0",
"externalAddress": "auto"
@@ -65,6 +73,9 @@
"numThreads": 1,
"timeout": "1m"
},
+ "profiling": {
+ "bindAddress": "127.0.0.1:6061"
+ },
"prometheus": {
"bindAddress": "127.0.0.1:9311"
},
diff --git a/plugins/autopeering/parameters.go b/plugins/autopeering/parameters.go
index 0cd2088f..01022ef3 100644
--- a/plugins/autopeering/parameters.go
+++ b/plugins/autopeering/parameters.go
@@ -7,12 +7,8 @@ import (
const (
// CfgEntryNodes defines the config flag of the entry nodes.
CfgEntryNodes = "autopeering.entryNodes"
-
- // CfgOutboundUpdateIntervalMs time after which out neighbors are updated.
- CfgOutboundUpdateIntervalMs = "autopeering.outboundUpdateIntervalMs"
)
func init() {
flag.StringSlice(CfgEntryNodes, []string{"V8LYtWWcPYYDTTXLeIEFjJEuWlsjDiI0+Pq/Cx9ai6g=@116.202.49.178:14626"}, "list of trusted entry nodes for auto peering")
- flag.Int(CfgOutboundUpdateIntervalMs, 10, "time after which out neighbors are updated")
}
diff --git a/tools/integration-tests/tester/framework/docker.go b/tools/integration-tests/tester/framework/docker.go
index 31b9bfd5..cbf01779 100644
--- a/tools/integration-tests/tester/framework/docker.go
+++ b/tools/integration-tests/tester/framework/docker.go
@@ -83,7 +83,6 @@ func (d *DockerContainer) CreateGoShimmerPeer(config GoShimmerConfig) error {
"--skip-config=true",
"--logger.level=debug",
fmt.Sprintf("--valueLayer.fcob.averageNetworkDelay=%d", ParaFCoBAverageNetworkDelay),
- fmt.Sprintf("--autopeering.outboundUpdateIntervalMs=%d", ParaOutboundUpdateIntervalMs),
fmt.Sprintf("--node.disablePlugins=%s", config.DisabledPlugins),
fmt.Sprintf("--pow.difficulty=%d", ParaPoWDifficulty),
fmt.Sprintf("--gracefulshutdown.waitToKillTime=%d", ParaWaitToKill),
--
GitLab