[FAB-8956] Reference correct config sections

Change-Id: Iff2e46ba4ac7413267e7c1e65cac3fa184ccdab2 Signed-off-by: Divyank Katira <Divyank.Katira@securekey.com>
hyperledger · Mar 19, 2018 · ef2ffa7 · ef2ffa7
1 parent 6ab7137
commit ef2ffa7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/pkg/core/config/config.go b/pkg/core/config/config.go
@@ -573,21 +573,21 @@ func (c *Config) getTimeout(tType core.TimeoutType) time.Duration {
 	case core.OrdererResponse:
 		timeout = c.configViper.GetDuration("client.orderer.timeout.response")
 	case core.ChannelConfigRefresh:
-		timeout = c.configViper.GetDuration("client.global.timeout.cache.channelConfig")
+		timeout = c.configViper.GetDuration("client.global.cache.channelConfig")
 	case core.ChannelMembershipRefresh:
-		timeout = c.configViper.GetDuration("client.global.timeout.cache.channelMembership")
+		timeout = c.configViper.GetDuration("client.global.cache.channelMembership")
 	case core.CacheSweepInterval: // EXPERIMENTAL - do we need this to be configurable?
 		timeout = c.configViper.GetDuration("client.cache.interval.sweep")
 		if timeout == 0 {
 			timeout = defaultCacheSweepInterval
 		}
 	case core.ConnectionIdle:
-		timeout = c.configViper.GetDuration("client.global.timeout.cache.connectionIdle")
+		timeout = c.configViper.GetDuration("client.global.cache.connectionIdle")
 		if timeout == 0 {
 			timeout = defaultConnIdleTimeout
 		}
 	case core.EventServiceIdle:
-		timeout = c.configViper.GetDuration("client.global.timeout.cache.eventServiceIdle")
+		timeout = c.configViper.GetDuration("client.global.cache.eventServiceIdle")
 		if timeout == 0 {
 			timeout = defaultEventServiceIdleTimeout
 		}

diff --git a/pkg/core/config/config_test.go b/pkg/core/config/config_test.go
@@ -389,8 +389,8 @@ func TestTimeouts(t *testing.T) {
 	configImpl.configViper.Set("client.global.timeout.query", "7h")
 	configImpl.configViper.Set("client.global.timeout.execute", "8h")
 	configImpl.configViper.Set("client.global.timeout.resmgmt", "118s")
-	configImpl.configViper.Set("client.global.timeout.cache.connectionIdle", "1m")
-	configImpl.configViper.Set("client.global.timeout.cache.eventServiceIdle", "2m")
+	configImpl.configViper.Set("client.global.cache.connectionIdle", "1m")
+	configImpl.configViper.Set("client.global.cache.eventServiceIdle", "2m")
 	configImpl.configViper.Set("client.orderer.timeout.response", "6s")
 
 	t1 := configImpl.TimeoutOrDefault(api.EndorserConnection)

diff --git a/test/fixtures/config/config_pkcs11_test.yaml b/test/fixtures/config/config_pkcs11_test.yaml
@@ -60,7 +60,7 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-      eventServiceIdle: 30s
+      eventServiceIdle: 2m
       channelConfig: 60s
       channelMembership: 30s
 

diff --git a/test/fixtures/config/config_revoke_test.yaml b/test/fixtures/config/config_revoke_test.yaml
@@ -61,7 +61,7 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-      eventServiceIdle: 500ms
+      eventServiceIdle: 2m
       channelConfig: 60s
       channelMembership: 30s
 

diff --git a/test/fixtures/config/config_test.yaml b/test/fixtures/config/config_test.yaml
@@ -61,7 +61,7 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-      eventServiceIdle: 500ms
+      eventServiceIdle: 2m
       channelConfig: 60s
       channelMembership: 30s
 

diff --git a/test/fixtures/config/config_test_local.yaml b/test/fixtures/config/config_test_local.yaml
@@ -63,7 +63,7 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-      eventServiceIdle: 500ms
+      eventServiceIdle: 2m
       channelConfig: 60s
       channelMembership: 30s
 

diff --git a/test/fixtures/config/config_test_no_orderer.yaml b/test/fixtures/config/config_test_no_orderer.yaml
@@ -61,7 +61,7 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-      eventServiceIdle: 30s
+      eventServiceIdle: 2m
       channelConfig: 60s
       channelMembership: 30s
 

diff --git a/test/fixtures/config/config_test_no_orderer_local.yaml b/test/fixtures/config/config_test_no_orderer_local.yaml
@@ -63,7 +63,7 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-      eventServiceIdle: 30s
+      eventServiceIdle: 2m
       channelConfig: 60s
       channelMembership: 30s