[FAB-8860] Remove unused config lines

Change-Id: Id1cf15784b81dab9fa7356fbb686d05a823f6e62
Signed-off-by: Troy Ronda <troy@troyronda.com>

pkg/client/msp/testdata/config_test.yaml

@@ -10,17 +10,6 @@
 #
 name: "global-trade-network"
 
-#
-# Any properties with an "x-" prefix will be treated as application-specific, exactly like how naming
-# in HTTP headers or swagger properties work. The SDK will simply ignore these fields and leave
-# them for the applications to process. This is a mechanism for different components of an application
-# to exchange information that are not part of the standard schema described below. In particular,
-# the "x-type" property with the "hlfv1" value example below is used by Hyperledger Composer to
-# determine the type of Fabric networks (v0.6 vs. v1.0) it needs to work with.
-#
-x-type: "hlfv1"
-x-loggingLevel: info
-
 #
 # Describe what the target network is/does.
 #
@@ -247,7 +236,6 @@ orderers:
     #TODO to be moved to high level, common for all grpc connections
     grpcOptions:
       ssl-target-name-override: orderer.example.com
-      grpc-max-send-message-length: 15
 #     These parameters should be set in coordination with the keepalive policy on the server,
 #     as incompatible settings can result in closing of connection.
 #     When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
@@ -277,7 +265,6 @@ peers:
     #TODO to be moved to high level, common for all grpc connections
     grpcOptions:
       ssl-target-name-override: peer0.org1.example.com
-      grpc.http2.keepalive_time: 15
 #     These parameters should be set in coordination with the keepalive policy on the server,
 #     as incompatible settings can result in closing of connection.
 #     When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled

pkg/client/resmgmt/testdata/ccproposal_test.yaml

@@ -10,8 +10,6 @@
 #
 name: "global-trade-network"
 
-x-type: "hlfv1"
-x-loggingLevel: info
 
 description: "The network to be in if you want to stay in the global trade business"
 version: 1.0.0
@@ -109,7 +107,6 @@ orderers:
 
     grpcOptions:
       ssl-target-name-override: orderer.example.com
-      grpc-max-send-message-length: 15
 
     tlsCACerts:
       # Certificate location absolute path
@@ -125,7 +122,6 @@ peers:
 
     grpcOptions:
       ssl-target-name-override:
-      grpc.http2.keepalive_time: 15
 
     tlsCACerts:
       # Certificate location absolute path
@@ -140,7 +136,6 @@ peers:
 
     grpcOptions:
       ssl-target-name-override:
-      grpc.http2.keepalive_time: 15
 
     tlsCACerts:
       # Certificate location absolute path

pkg/client/resmgmt/testdata/event_source_missing_test.yaml

@@ -10,8 +10,6 @@
 #
 name: "global-trade-network"
 
-x-type: "hlfv1"
-x-loggingLevel: info
 
 description: "The network to be in if you want to stay in the global trade business"
 version: 1.0.0
@@ -100,7 +98,6 @@ orderers:
 
     grpcOptions:
       ssl-target-name-override: orderer.example.com
-      grpc-max-send-message-length: 15
 
     tlsCACerts:
       # Certificate location absolute path
@@ -117,7 +114,6 @@ peers:
 
     grpcOptions:
       ssl-target-name-override:
-      grpc.http2.keepalive_time: 15
 
     tlsCACerts:
       # Certificate location absolute path

pkg/client/resmgmt/testdata/invalidchorderer_test.yaml

@@ -64,7 +64,6 @@ orderers:
     # they will be passed in as-is to gRPC client constructor
     grpcOptions:
       ssl-target-name-override: orderer.example.com
-      grpc-max-send-message-length: 15
 
     tlsCACerts:
       # Certificate location absolute path

pkg/client/resmgmt/testdata/invalidorderer_test.yaml

@@ -61,7 +61,6 @@ orderers:
 
     grpcOptions:
       ssl-target-name-override: orderer.example.com
-      grpc-max-send-message-length: 15
 
     tlsCACerts:
       # INVALID certificate location absolute path

pkg/core/config/config_test.go

@@ -32,10 +32,10 @@ var configImpl *Config
 const (
 	org0                            = "org0"
 	org1                            = "Org1"
-	configTestFilePath              = "../../../test/fixtures/config/config_test.yaml"
+	configTestFilePath              = "testdata/config_test.yaml"
 	configEmptyTestFilePath         = "testdata/empty.yaml"
 	configPemTestFilePath           = "testdata/config_test_pem.yaml"
-	configEmbeddedUsersTestFilePath = "../../../test/fixtures/config/config_test_embedded_pems.yaml"
+	configEmbeddedUsersTestFilePath = "testdata/config_test_embedded_pems.yaml"
 	configType                      = "yaml"
 	defaultConfigPath               = "testdata/template"
 )