[FAB-9058] add missing global cache entries

Change-Id: I214a9f5f855e7ee6057b65603c5c259b08412527 Signed-off-by: Baha Shaaban <baha.shaaban@securekey.com>
hyperledger · Mar 22, 2018 · b7343fe · b7343fe
1 parent 1a3cfe5
commit b7343fe
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 9 deletions.
diff --git a/pkg/client/msp/testdata/config_test.yaml b/pkg/client/msp/testdata/config_test.yaml
@@ -58,6 +58,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Root of the MSP directories with keys and certs.
   cryptoconfig:

diff --git a/pkg/client/resmgmt/testdata/ccproposal_test.yaml b/pkg/client/resmgmt/testdata/ccproposal_test.yaml
@@ -46,6 +46,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Needed to load users crypto keys and certs.
   cryptoconfig:

diff --git a/pkg/client/resmgmt/testdata/event_source_missing_test.yaml b/pkg/client/resmgmt/testdata/event_source_missing_test.yaml
@@ -44,6 +44,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Needed to load users crypto keys and certs.
   cryptoconfig:

diff --git a/pkg/core/config/testdata/config_test.yaml b/pkg/core/config/testdata/config_test.yaml
@@ -72,8 +72,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-      eventServiceIdle: 500ms
-
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Root of the MSP directories with keys and certs.
   cryptoconfig:

diff --git a/pkg/core/config/testdata/config_test_embedded_pems.yaml b/pkg/core/config/testdata/config_test_embedded_pems.yaml
@@ -61,8 +61,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-      eventServiceIdle: 30s
-
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Needed to load users crypto keys and certs.
 #  cryptoconfig:

diff --git a/pkg/core/config/testdata/config_test_pem.yaml b/pkg/core/config/testdata/config_test_pem.yaml
@@ -54,7 +54,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
-
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Needed to load users crypto keys and certs.
   cryptoconfig:

diff --git a/pkg/core/config/testdata/template/config.yaml b/pkg/core/config/testdata/template/config.yaml
@@ -55,6 +55,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Needed to load users crypto keys and certs.
   cryptoconfig:

diff --git a/pkg/fabsdk/testdata/test.yaml b/pkg/fabsdk/testdata/test.yaml
@@ -38,6 +38,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   cryptoconfig:
     path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}

diff --git a/pkg/msp/testdata/config_embedded_registrar.yaml b/pkg/msp/testdata/config_embedded_registrar.yaml
@@ -58,6 +58,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Root of the MSP directories with keys and certs.
   cryptoconfig:

diff --git a/pkg/msp/testdata/config_no_ca.yaml b/pkg/msp/testdata/config_no_ca.yaml
@@ -57,6 +57,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Root of the MSP directories with keys and certs.
   cryptoconfig:

diff --git a/pkg/msp/testdata/config_no_registrar.yaml b/pkg/msp/testdata/config_no_registrar.yaml
@@ -58,6 +58,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Root of the MSP directories with keys and certs.
   cryptoconfig:

diff --git a/pkg/msp/testdata/config_test.yaml b/pkg/msp/testdata/config_test.yaml
@@ -58,6 +58,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Root of the MSP directories with keys and certs.
   cryptoconfig:

diff --git a/pkg/msp/testdata/config_wrong_url.yaml b/pkg/msp/testdata/config_wrong_url.yaml
@@ -58,6 +58,9 @@ client:
       resmgmt: 60s
     cache:
       connectionIdle: 30s
+      eventServiceIdle: 2m
+      channelConfig: 60s
+      channelMembership: 30s
 
   # Root of the MSP directories with keys and certs.
   cryptoconfig:

diff --git a/test/fixtures/config/config_pkcs11_test.yaml b/test/fixtures/config/config_pkcs11_test.yaml
@@ -64,7 +64,6 @@ client:
       channelConfig: 60s
       channelMembership: 30s
 
-
   # Some SDKs support pluggable KV stores, the properties under "credentialStore"
   # are implementation specific
   credentialStore:

diff --git a/test/fixtures/config/config_revoke_test.yaml b/test/fixtures/config/config_revoke_test.yaml
@@ -65,7 +65,6 @@ client:
       channelConfig: 60s
       channelMembership: 30s
 
-
   # Root of the MSP directories with keys and certs.
   cryptoconfig:
     path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}

diff --git a/test/fixtures/config/config_test.yaml b/test/fixtures/config/config_test.yaml
@@ -65,7 +65,6 @@ client:
       channelConfig: 60s
       channelMembership: 30s
 
-
   # Root of the MSP directories with keys and certs.
   cryptoconfig:
     path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}

diff --git a/test/fixtures/config/config_test_no_orderer_local.yaml b/test/fixtures/config/config_test_no_orderer_local.yaml
@@ -67,7 +67,6 @@ client:
       channelConfig: 60s
       channelMembership: 30s
 
-
   # Needed to load users crypto keys and certs.
   cryptoconfig:
     path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}