diff --git a/pkg/client/msp/testdata/config_test.yaml b/pkg/client/msp/testdata/config_test.yaml index 26fcf1cdd4..8d6748aa85 100755 --- a/pkg/client/msp/testdata/config_test.yaml +++ b/pkg/client/msp/testdata/config_test.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -79,9 +74,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/idtestkeystore - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -139,14 +131,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # multi-org test channel orgchannel: @@ -187,18 +171,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -309,10 +281,6 @@ peers: certificateAuthorities: ca.org1.example.com: url: "http://localhost:8050" - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem @@ -332,10 +300,6 @@ certificateAuthorities: caName: ca.org1.example.com ca.org2.example.com: url: "http://localhost:8050" - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/pkg/client/resmgmt/testdata/ccproposal_test.yaml b/pkg/client/resmgmt/testdata/ccproposal_test.yaml index 2e564f02d8..716fdec731 100755 --- a/pkg/client/resmgmt/testdata/ccproposal_test.yaml +++ b/pkg/client/resmgmt/testdata/ccproposal_test.yaml @@ -8,10 +8,6 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" - - -description: "The network to be in if you want to stay in the global trade business" version: 1.0.0 client: diff --git a/pkg/client/resmgmt/testdata/event_source_missing_test.yaml b/pkg/client/resmgmt/testdata/event_source_missing_test.yaml index aff135ba44..514cc5a08d 100755 --- a/pkg/client/resmgmt/testdata/event_source_missing_test.yaml +++ b/pkg/client/resmgmt/testdata/event_source_missing_test.yaml @@ -8,10 +8,6 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" - - -description: "The network to be in if you want to stay in the global trade business" version: 1.0.0 client: diff --git a/pkg/client/resmgmt/testdata/invalidchorderer_test.yaml b/pkg/client/resmgmt/testdata/invalidchorderer_test.yaml index 1ba70f12a7..f6bb699b4e 100755 --- a/pkg/client/resmgmt/testdata/invalidchorderer_test.yaml +++ b/pkg/client/resmgmt/testdata/invalidchorderer_test.yaml @@ -4,7 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -name: "global-trade-network" description: "Test Invalid Channel Orderer Error" version: 1.0.0 diff --git a/pkg/client/resmgmt/testdata/invalidorderer_test.yaml b/pkg/client/resmgmt/testdata/invalidorderer_test.yaml index c609b28e4e..24560da221 100755 --- a/pkg/client/resmgmt/testdata/invalidorderer_test.yaml +++ b/pkg/client/resmgmt/testdata/invalidorderer_test.yaml @@ -4,7 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -name: "global-trade-network" description: "Test Invalid Channel Orderer Error" version: 1.0.0 diff --git a/pkg/client/resmgmt/testdata/noorderer_test.yaml b/pkg/client/resmgmt/testdata/noorderer_test.yaml index 1333198d95..c5119ac1a5 100755 --- a/pkg/client/resmgmt/testdata/noorderer_test.yaml +++ b/pkg/client/resmgmt/testdata/noorderer_test.yaml @@ -4,7 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -name: "global-trade-network" description: "Test No Orderer Error" version: 1.0.0 diff --git a/pkg/common/providers/core/network.go b/pkg/common/providers/core/network.go index 9d821f210d..f98f5448e5 100644 --- a/pkg/common/providers/core/network.go +++ b/pkg/common/providers/core/network.go @@ -14,7 +14,6 @@ import ( // NetworkConfig provides a static definition of a Hyperledger Fabric network type NetworkConfig struct { Name string - Xtype string Description string Version string Client ClientConfig @@ -31,7 +30,6 @@ type ClientConfig struct { Organization string Logging LoggingType CryptoConfig CCType - TLS TLSType TLSCerts MutualTLSConfig CredentialStore CredentialStoreType } @@ -46,18 +44,12 @@ type CCType struct { Path string } -// TLSType defines whether or not TLS is enabled -type TLSType struct { - Enabled bool -} - // CredentialStoreType defines pluggable KV store properties type CredentialStoreType struct { Path string CryptoStore struct { Path string } - Wallet string } // ChannelConfig provides the definition of channels for the network @@ -67,8 +59,6 @@ type ChannelConfig struct { // Peers a list of peer-channels that are part of this organization // to get the real Peer config object, use the Name field and fetch NetworkConfig.Peers[Name] Peers map[string]PeerChannelConfig - // Chaincodes list of services - Chaincodes []string //Policies list of policies for channel Policies ChannelPolicies } @@ -113,8 +103,6 @@ type OrganizationConfig struct { Users map[string]TLSKeyPair Peers []string CertificateAuthorities []string - AdminPrivateKey endpoint.TLSConfig - SignedCert endpoint.TLSConfig } // OrdererConfig defines an orderer configuration @@ -134,11 +122,10 @@ type PeerConfig struct { // CAConfig defines a CA configuration type CAConfig struct { - URL string - HTTPOptions map[string]interface{} - TLSCACerts MutualTLSConfig - Registrar EnrollCredentials - CAName string + URL string + TLSCACerts MutualTLSConfig + Registrar EnrollCredentials + CAName string } // EnrollCredentials holds credentials used for enrollment diff --git a/pkg/common/providers/core/provider.go b/pkg/common/providers/core/provider.go index 8b9d9d7644..d50dbd0c35 100644 --- a/pkg/common/providers/core/provider.go +++ b/pkg/common/providers/core/provider.go @@ -56,6 +56,7 @@ type Config interface { TLSClientCerts() ([]tls.Certificate, error) CredentialStorePath() string EventServiceType() EventServiceType + Lookup(key string) (interface{}, bool) } // ConfigProvider enables creation of a Config instance diff --git a/pkg/common/providers/test/mockcore/mockcore.gen.go b/pkg/common/providers/test/mockcore/mockcore.gen.go index 6992170c4c..6430569f08 100644 --- a/pkg/common/providers/test/mockcore/mockcore.gen.go +++ b/pkg/common/providers/test/mockcore/mockcore.gen.go @@ -350,6 +350,14 @@ func (m *MockConfig) PeerConfigByURL(arg0 string) (*core.PeerConfig, error) { return ret0, ret1 } +// Lookup gets the Value from config file by Key +func (m *MockConfig) Lookup(arg0 string) (interface{}, bool) { + ret := m.ctrl.Call(m, "Lookup", arg0) + ret0, _ := ret[0].(interface{}) + ret1, _ := ret[1].(bool) + return ret0, ret1 +} + // PeerConfigByURL indicates an expected call of PeerConfigByURL func (mr *MockConfigMockRecorder) PeerConfigByURL(arg0 interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerConfigByURL", reflect.TypeOf((*MockConfig)(nil).PeerConfigByURL), arg0) diff --git a/pkg/core/config/config.go b/pkg/core/config/config.go index cff0fe5af8..52bb1ad099 100644 --- a/pkg/core/config/config.go +++ b/pkg/core/config/config.go @@ -550,6 +550,15 @@ func (c *Config) EventServiceType() core.EventServiceType { } } +// Lookup gets the Value from config file by Key +func (c *Config) Lookup(key string) (interface{}, bool) { + value := c.configViper.Get(key) + if value != nil { + return value, true + } + return nil, false +} + func (c *Config) getTimeout(tType core.TimeoutType) time.Duration { var timeout time.Duration switch tType { @@ -621,7 +630,6 @@ func (c *Config) MSPID(org string) (string, error) { func (c *Config) cacheNetworkConfiguration() error { networkConfig := core.NetworkConfig{} networkConfig.Name = c.configViper.GetString("name") - networkConfig.Xtype = c.configViper.GetString("x-type") networkConfig.Description = c.configViper.GetString("description") networkConfig.Version = c.configViper.GetString("version") diff --git a/pkg/core/config/config_test.go b/pkg/core/config/config_test.go index c3fd9722a5..6742cc7a47 100644 --- a/pkg/core/config/config_test.go +++ b/pkg/core/config/config_test.go @@ -33,6 +33,7 @@ const ( org0 = "org0" org1 = "org1" configTestFilePath = "testdata/config_test.yaml" + configTestTemplateFilePath = "testdata/config_test_template.yaml" configEmptyTestFilePath = "testdata/empty.yaml" configPemTestFilePath = "testdata/config_test_pem.yaml" configEmbeddedUsersTestFilePath = "testdata/config_test_embedded_pems.yaml" @@ -51,21 +52,6 @@ func TestCAConfig(t *testing.T) { t.Fatalf("Failed to load config file") } - //Test network name - if vConfig.GetString("name") != "global-trade-network" { - t.Fatalf("Incorrect Network name") - } - - //Test client app specific variable x-type - if vConfig.GetString("x-type") != "hlfv1" { - t.Fatalf("Incorrect Netwok x-type") - } - - //Test network description - if vConfig.GetString("description") != "The network to be in if you want to stay in the global trade business" { - t.Fatalf("Incorrect Network description") - } - //Test network config version if vConfig.GetString("version") != "1.0.0" { t.Fatalf("Incorrect network version") @@ -1559,6 +1545,50 @@ func badOpt() Option { } } +func TestConfig_Lookup(t *testing.T) { + configImpl, err := FromFile(configTestTemplateFilePath)() + if err != nil { + t.Fatalf("Unexpected error reading config: %v", err) + } + + value, ok := configImpl.Lookup("name") + if !ok { + t.Fatal(err) + } + name := value.(string) + if name != "global-trade-network" { + t.Fatal("Expected Name to be global-trade-network") + } + + value, ok = configImpl.Lookup("description") + if !ok { + t.Fatal(err) + } + description := value.(string) + if description == "" { + t.Fatal("Expected non empty description") + } + + value, ok = configImpl.Lookup("x-type") + if !ok { + t.Fatal(err) + } + xType := value.(string) + if xType != "h1fv1" { + t.Fatal("Expected x-type to be h1fv1") + } + + value, ok = configImpl.Lookup("channels.mychannel.chaincodes") + if !ok { + t.Fatal(err) + } + chaincodes := value.([]interface{}) + if len(chaincodes) != 2 { + t.Fatal("Expected only 2 chaincodes") + } + +} + /* func TestDefaultConfigFromFile(t *testing.T) { c, err := FromFile(configEmptyTestFilePath, WithTemplatePath(defaultConfigPath)) diff --git a/pkg/core/config/testdata/config_test.yaml b/pkg/core/config/testdata/config_test.yaml index e94e7a2fbb..c6982a352c 100755 --- a/pkg/core/config/testdata/config_test.yaml +++ b/pkg/core/config/testdata/config_test.yaml @@ -8,23 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -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. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -93,9 +77,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -155,14 +136,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -223,18 +196,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -345,10 +306,6 @@ peers: certificateAuthorities: local.ca.org1.example.com: url: https://ca.org1.example.com:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem @@ -368,10 +325,6 @@ certificateAuthorities: caName: ca.org1.example.com local.ca.org2.example.com: url: https://ca.org2.example.com:8054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/pkg/core/config/testdata/config_test_embedded_pems.yaml b/pkg/core/config/testdata/config_test_embedded_pems.yaml index 06eaef4e57..cdf0160349 100755 --- a/pkg/core/config/testdata/config_test_embedded_pems.yaml +++ b/pkg/core/config/testdata/config_test_embedded_pems.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -82,9 +77,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -143,14 +135,6 @@ channels: ledgerQuery: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -295,18 +279,6 @@ organizations: certificateAuthorities: - ca-org1 - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -508,10 +480,6 @@ peers: certificateAuthorities: local.ca-org1: url: https://ca_peerOrg1:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: pem: - | @@ -578,10 +546,6 @@ certificateAuthorities: caName: ca-org1 local.ca-org2: url: https://ca_peerOrg2:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/pkg/core/config/testdata/config_test_pem.yaml b/pkg/core/config/testdata/config_test_pem.yaml index ca4b1acb2e..335e257c8d 100755 --- a/pkg/core/config/testdata/config_test_pem.yaml +++ b/pkg/core/config/testdata/config_test_pem.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -75,9 +70,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -136,14 +128,6 @@ channels: ledgerQuery: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -204,18 +188,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -334,10 +306,6 @@ peers: certificateAuthorities: ca.org1.example.com: url: https://ca_peerOrg1:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: pem: - | @@ -404,10 +372,6 @@ certificateAuthorities: caName: ca.org1.example.com ca.org2.example.com: url: https://ca_peerOrg2:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/pkg/core/config/testdata/config_test_template.yaml b/pkg/core/config/testdata/config_test_template.yaml new file mode 100755 index 0000000000..d845fc75c6 --- /dev/null +++ b/pkg/core/config/testdata/config_test_template.yaml @@ -0,0 +1,468 @@ +# +# Copyright SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# +# +# The network connection profile provides client applications the information about the target +# blockchain network that are necessary for the applications to interact with it. These are all +# knowledge that must be acquired from out-of-band sources. This file provides such a source. +# + +name: "global-trade-network" + +description: "The network that has all the configuration parameters" + +x-type: "h1fv1" + +# +# Schema version of the content. Used by the SDK to apply the corresponding parsing rules. +# +version: 1.0.0 + +# +# The client section used by GO SDK. +# +client: + + # Which organization does this application instance belong to? The value must be the name of an org + # defined under "organizations" + organization: org1 + + logging: + level: info + +# Global configuration for peer, event service and orderer timeouts + peer: + timeout: + response: 40s + connection: 3s + discovery: + # Expiry period for discovery service greylist filter + # The channel client will greylist peers that are found to be offline + # to prevent re-selecting them in subsequent retries. + # This interval will define how long a peer is greylisted + greylistExpiry: 5s + eventService: + # Event service type (deliver|eventhub) - default: eventhub + # NOTE: This is temporary until the SDK starts making use of channel capabilities + type: eventhub + timeout: + connection: 3s + registrationResponse: 10s + orderer: + timeout: + connection: 3s + response: 10s + global: + timeout: + query: 45s + execute: 60s + resmgmt: 60s + cache: + connectionIdle: 30s + eventServiceIdle: 2m + 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} + + # Some SDKs support pluggable KV stores, the properties under "credentialStore" + # are implementation specific + credentialStore: + # [Optional]. Used by user store. Not needed if all credentials are embedded in configuration + # and enrollments are performed elswhere. + path: "/tmp/state-store" + #[Optional]. Specific to Composer environment. Not used by SDK Go. + wallet: dummy-wallet + + # [Optional]. Specific to the CryptoSuite implementation used by GO SDK. Software-based implementations + # requiring a key store. PKCS#11 based implementations does not. + cryptoStore: + # Specific to the underlying KeyValueStore that backs the crypto key store. + path: /tmp/msp + + # BCCSP config for the client. Used by GO SDK. + BCCSP: + security: + enabled: true + default: + provider: "SW" + hashAlgorithm: "SHA2" + softVerify: true + ephemeral: false + level: 256 + + tlsCerts: + # [Optional]. Use system certificate pool when connecting to peers, orderers (for negotiating TLS) Default: false + systemCertPool: false + + # [Optional]. Client key and cert for TLS handshake with peers and orderers + client: + key: + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/config/mutual_tls/client_sdk_go-key.pem + cert: + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/config/mutual_tls/client_sdk_go.pem + +# +# [Optional]. But most apps would have this section so that channel objects can be constructed +# based on the content below. If an app is creating channels, then it likely will not need this +# section. +# +channels: + # name of the channel + mychannel: + # Required. list of orderers designated by the application to use for transactions on this + # channel. This list can be a result of access control ("org1" can only access "ordererA"), or + # operational decisions to share loads from applications among the orderers. The values must + # be "names" of orgs defined under "organizations/peers" + orderers: + - orderer.example.com + + # Required. list of peers from participating orgs + peers: + peer0.org1.example.com: + # [Optional]. will this peer be sent transaction proposals for endorsement? The peer must + # have the chaincode installed. The app can also use this property to decide which peers + # to send the chaincode install request. Default: true + endorsingPeer: true + + # [Optional]. will this peer be sent query proposals? The peer must have the chaincode + # installed. The app can also use this property to decide which peers to send the + # chaincode install request. Default: true + chaincodeQuery: true + + # [Optional]. will this peer be sent query proposals that do not require chaincodes, like + # queryBlock(), queryTransaction(), etc. Default: true + ledgerQuery: true + + # [Optional]. will this peer be the target of the SDK's listener registration? All peers can + # produce events but the app typically only needs to connect to one to listen to events. + # Default: true + eventSource: true + + # [Optional]. what chaincodes are expected to exist on this channel? The application can use + # this information to validate that the target peers are in the expected state by comparing + # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() + chaincodes: + # the format follows the "canonical name" of chaincodes by fabric code + - example02:v1 + - marbles:1.0 + + # [Optional]. The application can use these options to perform channel operations like retrieving channel + # config etc. + policies: + #[Optional] options for retrieving channel configuration blocks + queryChannelConfig: + #[Optional] min number of success responses (from targets/peers) + minResponses: 1 + #[Optional] channel config will be retrieved for these number of random targets + maxTargets: 1 + #[Optional] retry options for query config block + retryOpts: + #[Optional] number of retry attempts + attempts: 5 + #[Optional] the back off interval for the first retry attempt + initialBackoff: 500ms + #[Optional] the maximum back off interval for any retry attempt + maxBackoff: 5s + #[Optional] he factor by which the initial back off period is exponentially incremented + backoffFactor: 2.0 + + # multi-org test channel + orgchannel: + + orderers: + - orderer.example.com + + peers: + peer0.org1.example.com: + endorsingPeer: true + chaincodeQuery: true + ledgerQuery: true + eventSource: true + + peer0.org2.example.com: + endorsingPeer: true + chaincodeQuery: true + ledgerQuery: true + eventSource: true + +# +# list of participating organizations in this network +# +organizations: + org1: + mspid: Org1MSP + + # This org's MSP store (absolute path or relative to client.cryptoconfig) + cryptoPath: peerOrganizations/org1.example.com/users/{username}@org1.example.com/msp + + peers: + - peer0.org1.example.com + + # [Optional]. Certificate Authorities issue certificates for identification purposes in a Fabric based + # network. Typically certificates provisioning is done in a separate process outside of the + # runtime network. Fabric-CA is a special certificate authority that provides a REST APIs for + # dynamic certificate management (enroll, revoke, re-enroll). The following section is only for + # Fabric-CA servers. + certificateAuthorities: + - ca.org1.example.com + + # [Optional]. If the application is going to make requests that are reserved to organization + # administrators, including creating/updating channels, installing/instantiating chaincodes, it + # must have access to the admin identity represented by the private key and signing certificate. + # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for + # convenience in development mode, production systems should not expose sensitive information + # this way. The SDK should allow applications to set the org admin identity via APIs, and only use + # this route as an alternative when it exists. + adminPrivateKey: + pem: "-----BEGIN PRIVATE KEY----- " + signedCert: + path: "/tmp/somepath/signed-cert.pem" + + # the profile will contain public information about organizations other than the one it belongs to. + # These are necessary information to make transaction lifecycles work, including MSP IDs and + # peers with a public URL to send transaction proposals. The file will not contain private + # information reserved for members of the organization, such as admin key and certificate, + # fabric-ca registrar enroll ID and secret, etc. + org2: + mspid: Org2MSP + + # This org's MSP store (absolute path or relative to client.cryptoconfig) + cryptoPath: peerOrganizations/org2.example.com/users/{username}@org2.example.com/msp + + peers: + - peer0.org2.example.com + + certificateAuthorities: + - ca.org2.example.com + + # Orderer Org name + ordererorg: + # Membership Service Provider ID for this organization + mspID: "OrdererOrg" + + # Needed to load users crypto keys and certs for this org (absolute path or relative to global crypto path, DEV mode) + cryptoPath: ordererOrganizations/example.com/users/{username}@example.com/msp + + +# +# List of orderers to send transaction and channel create/update requests to. For the time +# being only one orderer is needed. If more than one is defined, which one get used by the +# SDK is implementation specific. Consult each SDK's documentation for its handling of orderers. +# +orderers: + local.orderer.example.com: + url: orderer.example.com:7050 + + # these are standard properties defined by the gRPC library + # they will be passed in as-is to gRPC client constructor + #TODO to be moved to high level, common for all grpc connections + grpcOptions: + ssl-target-name-override: orderer.example.com +# 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 + keep-alive-time: 0s + keep-alive-timeout: 20s + keep-alive-permit: false + fail-fast: false + #will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs + allow-insecure: false + + tlsCACerts: + # Certificate location absolute path + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem + +# +# List of peers to send various requests to, including endorsement, query +# and event listener registration. +# +peers: + local.peer0.org1.example.com: + # this URL is used to send endorsement and query requests + url: peer0.org1.example.com:7051 + + # this URL is used to connect the EventHub and registering event listeners + eventUrl: peer0.org1.example.com:7053 + + #TODO to be moved to high level, common for all grpc connections + grpcOptions: + ssl-target-name-override: peer0.org1.example.com +# 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 + keep-alive-time: 0s + keep-alive-timeout: 20s + keep-alive-permit: false + fail-fast: false + #will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs + allow-insecure: false + + tlsCACerts: + # Certificate location absolute path + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem + + local.peer0.org2.example.com: + url: peer0.org2.example.com:8051 + eventUrl: peer0.org2.example.com:8053 + #TODO to be moved to high level, common for all grpc connections + grpcOptions: + ssl-target-name-override: peer0.org2.example.com +# 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 + keep-alive-time: 0s + keep-alive-timeout: 20s + keep-alive-permit: false + fail-fast: false + #will be taken into consideration if address has no protocol defined, if true then grpc or else grpcs + allow-insecure: false + + tlsCACerts: + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/${CRYPTOCONFIG_FIXTURES_PATH}/peerOrganizations/org2.example.com/tlsca/tlsca.org2.example.com-cert.pem + +# +# Fabric-CA is a special kind of Certificate Authority provided by Hyperledger Fabric which allows +# certificate management to be done via REST APIs. Application may choose to use a standard +# Certificate Authority instead of Fabric-CA, in which case this section would not be specified. +# +certificateAuthorities: + local.ca.org1.example.com: + url: https://ca.org1.example.com:7054 + # the properties specified under this object are passed to the 'http' client verbatim when + # making the request to the Fabric-CA server + httpOptions: + verify: true + tlsCACerts: + # Comma-Separated list of paths + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem + # Client key and cert for SSL handshake with Fabric CA + client: + key: + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/client/client_fabric_client-key.pem + cert: + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/client/client_fabric_client.pem + + # Fabric-CA supports dynamic user enrollment via REST APIs. A "root" user, a.k.a registrar, is + # needed to enroll and invoke new users. + registrar: + enrollId: admin + enrollSecret: adminpw + # [Optional] The optional name of the CA. + caName: ca.org1.example.com + local.ca.org2.example.com: + url: https://ca.org2.example.com:8054 + # the properties specified under this object are passed to the 'http' client verbatim when + # making the request to the Fabric-CA server + httpOptions: + verify: true + tlsCACerts: + # Comma-Separated list of paths + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem + # Client key and cert for SSL handshake with Fabric CA + client: + key: + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/client/client_fabric_client-key.pem + cert: + path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/client/client_fabric_client.pem + + # Fabric-CA supports dynamic user enrollment via REST APIs. A "root" user, a.k.a registrar, is + # needed to enroll and invoke new users. + registrar: + enrollId: admin + enrollSecret: adminpw + # [Optional] The optional name of the CA. + caName: ca.org2.example.com + +# EntityMatchers enable substitution of network hostnames with static configurations + # so that properties can be mapped. Regex can be used for this purpose +# UrlSubstitutionExp can be empty which means the same network hostname will be used +# UrlSubstitutionExp can be given same as mapped peer url, so that mapped peer url can be used +# UrlSubstitutionExp can have golang regex matchers like $1.local.example.$2:$3 for pattern + # like peer0.org1.example.com:1234 which converts peer0.org1.example.com to peer0.org1.local.example.com:1234 +# EventUrlSubstitutionExp and sslTargetOverrideUrlSubstitutionExp follow in the same lines as + # SubstitutionExp for the fields eventUrl and gprcOptions.ssl-target-name-override respectively +# In any case mappedHost's config will be used, so mapped host cannot be empty, if entityMatchers are used +entityMatchers: + peer: + - pattern: (\w+).org1.example.(\w+) + urlSubstitutionExp: peer0.org1.example.com:7051 + eventUrlSubstitutionExp: peer0.org1.example.com:7053 + sslTargetOverrideUrlSubstitutionExp: peer0.org1.example.com + mappedHost: local.peer0.org1.example.com + + - pattern: (\w+).org2.example.(\w+) + urlSubstitutionExp: peer0.org2.example.com:8051 + eventUrlSubstitutionExp: peer0.org2.example.com:8053 + sslTargetOverrideUrlSubstitutionExp: peer0.org2.example.com + mappedHost: local.peer0.org2.example.com + + - pattern: (\w+).example5.(\w+) + urlSubstitutionExp: localhost:7051 + eventUrlSubstitutionExp: localhost:7053 + sslTargetOverrideUrlSubstitutionExp: localhost + mappedHost: local.peer0.org1.example.com + + - pattern: (\w+).example2.(\w+):(\d+) + urlSubstitutionExp: localhost:7051 + eventUrlSubstitutionExp: localhost:7053 + sslTargetOverrideUrlSubstitutionExp: localhost + mappedHost: local.peer0.org2.example.com + + - pattern: (\w+).example3.(\w+) + urlSubstitutionExp: + eventUrlSubstitutionExp: + sslTargetOverrideUrlSubstitutionExp: + mappedHost: local.peer0.org1.example.com + + - pattern: (\w+).example4.(\w+):(\d+) + urlSubstitutionExp: $1.org1.example.$2:$3 + eventUrlSubstitutionExp: $1.org1.example.$2:7053 + sslTargetOverrideUrlSubstitutionExp: $1.org1.example.$2 + mappedHost: local.peer0.org1.example.com + + - pattern: (\w+).example2.com:(\d+) + urlSubstitutionExp: peer0.org2.example.com:7051 + eventUrlSubstitutionExp: + sslTargetOverrideUrlSubstitutionExp: + mappedHost: local.peer0.org2.example.com + + - pattern: (\w+).org1.example.(\w+):(\d+) + urlSubstitutionExp: peer0.org1.example.com:7051 + eventUrlSubstitutionExp: peer0.org1.example.com:7053 + sslTargetOverrideUrlSubstitutionExp: peer0.org1.example.com + mappedHost: local.peer0.org1.example.com + + orderer: + - pattern: (\w+).example2.(\w+) + urlSubstitutionExp: localhost:7050 + sslTargetOverrideUrlSubstitutionExp: localhost + mappedHost: local.orderer.example.com + + - pattern: (\w+).example.(\w+) + urlSubstitutionExp: orderer.example.com:7050 + sslTargetOverrideUrlSubstitutionExp: orderer.example.com + mappedHost: local.orderer.example.com + + - pattern: (\w+).example3.(\w+) + urlSubstitutionExp: + sslTargetOverrideUrlSubstitutionExp: + mappedHost: local.orderer.example.com + + - pattern: (\w+).example4.(\w+):(\d+) + urlSubstitutionExp: $1.example.$2:$3 + sslTargetOverrideUrlSubstitutionExp: $1.example.$2 + mappedHost: local.orderer.example.com + + certificateAuthorities: + - pattern: (\w+).org1.example.(\w+) + urlSubstitutionExp: + mappedHost: local.ca.org1.example.com + + - pattern: (\w+).org2.example.(\w+) + urlSubstitutionExp: + mappedHost: local.ca.org2.example.com \ No newline at end of file diff --git a/pkg/core/config/testdata/template/config.yaml b/pkg/core/config/testdata/template/config.yaml index b9c80401d4..6dab47ff31 100755 --- a/pkg/core/config/testdata/template/config.yaml +++ b/pkg/core/config/testdata/template/config.yaml @@ -76,9 +76,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /usually/it/is/tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - wallet: wallet-name-unused-by-sdk-go - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -137,15 +134,6 @@ channels: # Default: true # eventSource: true - - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() -# chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code -# - example02:v1 -# - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. # policies: @@ -183,20 +171,6 @@ organizations: # Fabric-CA servers. # certificateAuthorities: # - ca.org1.example.com - - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. -# adminPrivateKey: -# pem: "-----BEGIN PRIVATE KEY----- " -# signedCert: -# path: "/tmp/somepath/signed-cert.pem" - - # # List of orderers to send transaction and channel create/update requests to. For the time # being only one orderer is needed. If more than one is defined, which one get used by the @@ -262,10 +236,6 @@ peers: certificateAuthorities: # ca.org1.example.com: # url: https://ca.org1.example.com:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server -# httpOptions: -# verify: true # tlsCACerts: # dash-pipe ('- |') delimited pem strings of CA cert # pem: 'pem strings of CA cert' diff --git a/pkg/fab/mocks/mockconfig.go b/pkg/fab/mocks/mockconfig.go index a5c5c0490f..faca7d4ef0 100644 --- a/pkg/fab/mocks/mockconfig.go +++ b/pkg/fab/mocks/mockconfig.go @@ -128,7 +128,7 @@ func (c *MockConfig) PeerConfig(org string, name string) (*config.PeerConfig, er // PeerConfigByURL retrieves PeerConfig by URL func (c *MockConfig) PeerConfigByURL(url string) (*config.PeerConfig, error) { if url == "invalid" { - return nil, errors.New("no orderer") + return nil, errors.New("no peer") } if c.customPeerCfg != nil { return c.customPeerCfg, nil @@ -321,3 +321,15 @@ func (c *MockConfig) TLSClientCerts() ([]tls.Certificate, error) { func (c *MockConfig) EventServiceType() config.EventServiceType { return config.DeliverEventServiceType } + +// Lookup gets the Value from config file by Key +func (c *MockConfig) Lookup(key string) (interface{}, bool) { + if key == "invalid" { + return nil, false + } + value, ok := c.Lookup(key) + if !ok { + return nil, false + } + return value, true +} diff --git a/pkg/fabsdk/testdata/test.yaml b/pkg/fabsdk/testdata/test.yaml index 43e6d25e63..3ea0b8b541 100755 --- a/pkg/fabsdk/testdata/test.yaml +++ b/pkg/fabsdk/testdata/test.yaml @@ -4,10 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -name: "global-trade-network" - - -description: "The network to be in if you want to stay in the global trade business" version: 1.0.0 client: @@ -155,9 +151,6 @@ certificateAuthorities: ca.org2.example.com: url: https://ca.org2.example.com:7054 - httpOptions: - verify: true - tlsCACerts: path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem client: diff --git a/pkg/msp/test/mockmsp/mockconfig.go b/pkg/msp/test/mockmsp/mockconfig.go index 7aedc2dbe7..257021c094 100644 --- a/pkg/msp/test/mockmsp/mockconfig.go +++ b/pkg/msp/test/mockmsp/mockconfig.go @@ -231,3 +231,8 @@ func (c *MockConfig) TLSClientCerts() ([]tls.Certificate, error) { func (c *MockConfig) EventServiceType() core.EventServiceType { return core.DeliverEventServiceType } + +// Lookup gets the Value from config file by Key +func (c *MockConfig) Lookup(key string) (interface{}, bool) { + return nil, false +} diff --git a/pkg/msp/testdata/config_embedded_registrar.yaml b/pkg/msp/testdata/config_embedded_registrar.yaml index 0808d550bd..e9cb6fd315 100755 --- a/pkg/msp/testdata/config_embedded_registrar.yaml +++ b/pkg/msp/testdata/config_embedded_registrar.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -79,9 +74,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/idtestkeystore - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -139,14 +131,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # multi-org test channel orgchannel: @@ -207,18 +191,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # # List of orderers to send transaction and channel create/update requests to. For the time # being only one orderer is needed. If more than one is defined, which one get used by the @@ -284,10 +256,6 @@ peers: certificateAuthorities: ca.org1.example.com: url: "http://localhost:8050" - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/pkg/msp/testdata/config_no_ca.yaml b/pkg/msp/testdata/config_no_ca.yaml index 5755fbfa4b..7301f88cb6 100755 --- a/pkg/msp/testdata/config_no_ca.yaml +++ b/pkg/msp/testdata/config_no_ca.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -78,9 +73,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/idtestkeystore - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -138,14 +130,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # multi-org test channel orgchannel: @@ -180,18 +164,6 @@ organizations: certificateAuthorities: #- ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # # List of orderers to send transaction and channel create/update requests to. For the time # being only one orderer is needed. If more than one is defined, which one get used by the diff --git a/pkg/msp/testdata/config_no_registrar.yaml b/pkg/msp/testdata/config_no_registrar.yaml index 6684e5c731..51f538c252 100755 --- a/pkg/msp/testdata/config_no_registrar.yaml +++ b/pkg/msp/testdata/config_no_registrar.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -79,9 +74,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/idtestkeystore - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -139,14 +131,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # multi-org test channel orgchannel: @@ -181,18 +165,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # # List of orderers to send transaction and channel create/update requests to. For the time # being only one orderer is needed. If more than one is defined, which one get used by the @@ -258,10 +230,6 @@ peers: certificateAuthorities: ca.org1.example.com: url: "http://localhost:7054" - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/pkg/msp/testdata/config_test.yaml b/pkg/msp/testdata/config_test.yaml index bb8b8c55f8..37b2ac5b6c 100755 --- a/pkg/msp/testdata/config_test.yaml +++ b/pkg/msp/testdata/config_test.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -79,9 +74,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/idtestkeystore - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -139,14 +131,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # multi-org test channel orgchannel: @@ -187,18 +171,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -309,10 +281,6 @@ peers: certificateAuthorities: ca.org1.example.com: url: "http://localhost:8050" - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem @@ -332,10 +300,6 @@ certificateAuthorities: caName: ca.org1.example.com ca.org2.example.com: url: "http://localhost:8090" - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/pkg/msp/testdata/config_wrong_url.yaml b/pkg/msp/testdata/config_wrong_url.yaml index 65e90f6b6e..59bb8940f9 100755 --- a/pkg/msp/testdata/config_wrong_url.yaml +++ b/pkg/msp/testdata/config_wrong_url.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -79,9 +74,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -139,14 +131,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # multi-org test channel orgchannel: @@ -187,18 +171,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -309,10 +281,6 @@ peers: certificateAuthorities: ca.org1.example.com: url: "http://localhost:8091" - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem @@ -332,10 +300,6 @@ certificateAuthorities: caName: ca.org1.example.com ca.org2.example.com: url: "http://localhost:8091" - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/test/fixtures/config/config_pkcs11_test.yaml b/test/fixtures/config/config_pkcs11_test.yaml index 37f0af0a37..ea72f8671e 100755 --- a/test/fixtures/config/config_pkcs11_test.yaml +++ b/test/fixtures/config/config_pkcs11_test.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -77,9 +72,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -158,14 +150,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -279,18 +263,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -433,10 +405,6 @@ peers: certificateAuthorities: ca.org1.example.com: url: https://ca.org1.example.com:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem @@ -456,10 +424,6 @@ certificateAuthorities: caName: ca.org1.example.com ca.org2.example.com: url: https://ca.org2.example.com:8054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/test/fixtures/config/config_revoke_test.yaml b/test/fixtures/config/config_revoke_test.yaml index 92da14f40b..e4d59a52a7 100644 --- a/test/fixtures/config/config_revoke_test.yaml +++ b/test/fixtures/config/config_revoke_test.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -82,9 +77,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -144,14 +136,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -215,18 +199,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -340,10 +312,6 @@ peers: certificateAuthorities: local.ca.org1.example.com: url: https://ca.org1.example.com:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem @@ -363,10 +331,6 @@ certificateAuthorities: caName: ca.org1.example.com local.ca.org2.example.com: url: https://ca.org2.example.com:8054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/test/fixtures/config/config_test.yaml b/test/fixtures/config/config_test.yaml index c3e9dac803..19e3862b8c 100755 --- a/test/fixtures/config/config_test.yaml +++ b/test/fixtures/config/config_test.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -82,9 +77,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -144,15 +136,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -233,18 +216,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -352,10 +323,6 @@ peers: certificateAuthorities: local.ca.org1.example.com: url: https://ca.org1.example.com:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem @@ -375,10 +342,6 @@ certificateAuthorities: caName: ca.org1.example.com local.ca.org2.example.com: url: https://ca.org2.example.com:8054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/test/fixtures/config/config_test_local.yaml b/test/fixtures/config/config_test_local.yaml index 7663d6f122..c85b7829b0 100755 --- a/test/fixtures/config/config_test_local.yaml +++ b/test/fixtures/config/config_test_local.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -84,9 +79,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - #wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -146,14 +138,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -233,18 +217,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # the profile will contain public information about organizations other than the one it belongs to. # These are necessary information to make transaction lifecycles work, including MSP IDs and # peers with a public URL to send transaction proposals. The file will not contain private @@ -355,10 +327,6 @@ peers: certificateAuthorities: local.ca.org1.example.com: url: https://localhost:7054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem @@ -378,10 +346,6 @@ certificateAuthorities: caName: ca.org1.example.com local.ca.org2.example.com: url: https://localhost:8054 - # the properties specified under this object are passed to the 'http' client verbatim when - # making the request to the Fabric-CA server - httpOptions: - verify: true tlsCACerts: # Comma-Separated list of paths path: ${GOPATH}/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabricca/tls/certs/ca_root.pem diff --git a/test/fixtures/config/config_test_no_orderer.yaml b/test/fixtures/config/config_test_no_orderer.yaml index 288281d061..91dc53b671 100755 --- a/test/fixtures/config/config_test_no_orderer.yaml +++ b/test/fixtures/config/config_test_no_orderer.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -82,9 +77,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -138,14 +130,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -187,18 +171,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # # List of peers to send various requests to, including endorsement, query diff --git a/test/fixtures/config/config_test_no_orderer_local.yaml b/test/fixtures/config/config_test_no_orderer_local.yaml index 3c73abeabe..75cff07923 100755 --- a/test/fixtures/config/config_test_no_orderer_local.yaml +++ b/test/fixtures/config/config_test_no_orderer_local.yaml @@ -8,12 +8,7 @@ # blockchain network that are necessary for the applications to interact with it. These are all # knowledge that must be acquired from out-of-band sources. This file provides such a source. # -name: "global-trade-network" -# -# Describe what the target network is/does. -# -description: "The network to be in if you want to stay in the global trade business" # # Schema version of the content. Used by the SDK to apply the corresponding parsing rules. @@ -84,9 +79,6 @@ client: # Specific to the underlying KeyValueStore that backs the crypto key store. path: /tmp/msp - # [Optional]. Specific to Composer environment. Not used by SDK Go. - wallet: wallet-name - # BCCSP config for the client. Used by GO SDK. BCCSP: security: @@ -140,14 +132,6 @@ channels: # Default: true eventSource: true - # [Optional]. what chaincodes are expected to exist on this channel? The application can use - # this information to validate that the target peers are in the expected state by comparing - # this list with the query results of getInstalledChaincodes() and getInstantiatedChaincodes() - chaincodes: - # the format follows the "canonical name" of chaincodes by fabric code - - example02:v1 - - marbles:1.0 - # [Optional]. The application can use these options to perform channel operations like retrieving channel # config etc. policies: @@ -189,18 +173,6 @@ organizations: certificateAuthorities: - ca.org1.example.com - # [Optional]. If the application is going to make requests that are reserved to organization - # administrators, including creating/updating channels, installing/instantiating chaincodes, it - # must have access to the admin identity represented by the private key and signing certificate. - # Both properties can be the PEM string or local path to the PEM file. Note that this is mainly for - # convenience in development mode, production systems should not expose sensitive information - # this way. The SDK should allow applications to set the org admin identity via APIs, and only use - # this route as an alternative when it exists. - adminPrivateKey: - pem: "-----BEGIN PRIVATE KEY----- " - signedCert: - path: "/tmp/somepath/signed-cert.pem" - # # List of peers to send various requests to, including endorsement, query