Merge "Add fake generation directives discovery/support/mocks"

hyperledger · Nov 11, 2019 · 7254385 · 7254385
2 parents 31534f0 + 3f8ccfb
commit 7254385
Show file tree

Hide file tree

Showing 20 changed files with 1,137 additions and 773 deletions.
diff --git a/discovery/cmd/mocks/channel_response.go b/discovery/cmd/mocks/channel_response.go
diff --git a/discovery/cmd/mocks/command_registrar.go b/discovery/cmd/mocks/command_registrar.go
diff --git a/discovery/cmd/mocks/local_response.go b/discovery/cmd/mocks/local_response.go
diff --git a/discovery/cmd/mocks/response_parser.go b/discovery/cmd/mocks/response_parser.go
diff --git a/discovery/cmd/mocks/service_response.go b/discovery/cmd/mocks/service_response.go
diff --git a/discovery/cmd/mocks/stub.go b/discovery/cmd/mocks/stub.go
diff --git a/discovery/support/acl/support_test.go b/discovery/support/acl/support_test.go
@@ -62,7 +62,7 @@ func TestConfigSequence(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
-			chConfig := &mocks.ChanConfig{}
+			chConfig := &mocks.ChannelConfigGetter{}
 			r := &mocks.Resources{}
 			v := &mocks.ConfigtxValidator{}
 			if test.resourcesFound {
@@ -92,7 +92,7 @@ func TestEligibleForService(t *testing.T) {
 	v.VerifyByChannelReturnsOnCall(1, nil)
 	e.EvaluateSignedDataReturnsOnCall(0, errors.New("verification failed for local msp"))
 	e.EvaluateSignedDataReturnsOnCall(1, nil)
-	chConfig := &mocks.ChanConfig{}
+	chConfig := &mocks.ChannelConfigGetter{}
 	sup := acl.NewDiscoverySupport(v, e, chConfig)
 	err := sup.EligibleForService("mychannel", protoutil.SignedData{})
 	assert.Equal(t, "verification failed", err.Error())
@@ -106,7 +106,7 @@ func TestEligibleForService(t *testing.T) {
 
 func TestSatisfiesPrincipal(t *testing.T) {
 	var (
-		chConfig                      = &mocks.ChanConfig{}
+		chConfig                      = &mocks.ChannelConfigGetter{}
 		resources                     = &mocks.Resources{}
 		mgr                           = &mocks.MSPManager{}
 		idThatDoesNotSatisfyPrincipal = &mocks.Identity{}

diff --git a/discovery/support/mocks/chanconfig.go → ...ry/support/mocks/channel_config_getter.go b/discovery/support/mocks/chanconfig.go → ...ry/support/mocks/channel_config_getter.go
diff --git a/discovery/support/mocks/channel_policy_manager_getter.go b/discovery/support/mocks/channel_policy_manager_getter.go
diff --git a/discovery/support/mocks/config.go → ...very/support/mocks/config_block_getter.go b/discovery/support/mocks/config.go → ...very/support/mocks/config_block_getter.go