From ca6fe2026e3d45824a38ba945cfa729fc515215f Mon Sep 17 00:00:00 2001 From: Emil Nikolov Date: Tue, 13 Feb 2018 22:57:36 +0100 Subject: [PATCH] FAB-8262 Clean up base_test_setup.go Initialize Change-Id: I5bfd776a42d4b0b68d2a34cd4e4e88439997dd33 Signed-off-by: Emil Nikolov --- test/integration/base_test_setup.go | 6 +++--- test/integration/fab/install_chaincode_test.go | 2 +- test/integration/fab/main_test.go | 2 +- test/integration/fab/transient_data_test.go | 2 +- test/integration/sdk/channel_client_test.go | 2 +- test/integration/sdk/channel_config_test.go | 4 ++-- test/integration/sdk/custom_cryptosuite_test.go | 2 +- test/integration/sdk/sdk_provider_test.go | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/integration/base_test_setup.go b/test/integration/base_test_setup.go index b2719d0961..8082fd7587 100644 --- a/test/integration/base_test_setup.go +++ b/test/integration/base_test_setup.go @@ -75,7 +75,7 @@ func ExampleCCUpgradeArgs() [][]byte { } // Initialize reads configuration from file and sets up client, channel and event hub -func (setup *BaseSetupImpl) Initialize(t *testing.T) error { +func (setup *BaseSetupImpl) Initialize() error { // Create SDK setup for the integration tests sdk, err := fabsdk.New(config.FromFile(setup.ConfigFile)) if err != nil { @@ -107,7 +107,7 @@ func (setup *BaseSetupImpl) Initialize(t *testing.T) error { req := chmgmt.SaveChannelRequest{ChannelID: setup.ChannelID, ChannelConfig: setup.ChannelConfig, SigningIdentity: session} InitializeChannel(sdk, setup.OrgID, req, targets) - if err := setup.setupEventHub(t, sdk, setup.Identity); err != nil { + if err := setup.setupEventHub(sdk, setup.Identity); err != nil { return err } @@ -161,7 +161,7 @@ func GetChannel(sdk *fabsdk.FabricSDK, ic fab.IdentityContext, config apiconfig. return channel, nil } -func (setup *BaseSetupImpl) setupEventHub(t *testing.T, client *fabsdk.FabricSDK, identity fab.IdentityContext) error { +func (setup *BaseSetupImpl) setupEventHub(client *fabsdk.FabricSDK, identity fab.IdentityContext) error { eventHub, err := client.FabricProvider().CreateEventHub(identity, setup.ChannelID) if err != nil { return err diff --git a/test/integration/fab/install_chaincode_test.go b/test/integration/fab/install_chaincode_test.go index bd37315298..671a68a8b8 100644 --- a/test/integration/fab/install_chaincode_test.go +++ b/test/integration/fab/install_chaincode_test.go @@ -34,7 +34,7 @@ func TestChaincodeInstal(t *testing.T) { ConnectEventHub: true, } - if err := testSetup.Initialize(t); err != nil { + if err := testSetup.Initialize(); err != nil { t.Fatalf(err.Error()) } diff --git a/test/integration/fab/main_test.go b/test/integration/fab/main_test.go index ea7b361bd0..59b7469bed 100644 --- a/test/integration/fab/main_test.go +++ b/test/integration/fab/main_test.go @@ -56,7 +56,7 @@ func initializeTests(t *testing.T, chainCodeID string) integration.BaseSetupImpl ConnectEventHub: true, } - if err := testSetup.Initialize(t); err != nil { + if err := testSetup.Initialize(); err != nil { t.Fatalf(err.Error()) } diff --git a/test/integration/fab/transient_data_test.go b/test/integration/fab/transient_data_test.go index 1eba11c255..e597959e01 100644 --- a/test/integration/fab/transient_data_test.go +++ b/test/integration/fab/transient_data_test.go @@ -27,7 +27,7 @@ func TestTransient(t *testing.T) { ConnectEventHub: true, } - if err := testSetup.Initialize(t); err != nil { + if err := testSetup.Initialize(); err != nil { t.Fatalf(err.Error()) } diff --git a/test/integration/sdk/channel_client_test.go b/test/integration/sdk/channel_client_test.go index d7378de6a2..e97e4e54b8 100644 --- a/test/integration/sdk/channel_client_test.go +++ b/test/integration/sdk/channel_client_test.go @@ -36,7 +36,7 @@ func TestChannelClient(t *testing.T) { ConnectEventHub: true, } - if err := testSetup.Initialize(t); err != nil { + if err := testSetup.Initialize(); err != nil { t.Fatalf(err.Error()) } diff --git a/test/integration/sdk/channel_config_test.go b/test/integration/sdk/channel_config_test.go index 9bee9e9eb4..d73c64e98b 100644 --- a/test/integration/sdk/channel_config_test.go +++ b/test/integration/sdk/channel_config_test.go @@ -31,7 +31,7 @@ func TestChannelConfig(t *testing.T) { ConnectEventHub: true, } - if err := testSetup.Initialize(t); err != nil { + if err := testSetup.Initialize(); err != nil { t.Fatalf(err.Error()) } @@ -81,7 +81,7 @@ func TestChannelConfigWithOrderer(t *testing.T) { ConnectEventHub: true, } - if err := testSetup.Initialize(t); err != nil { + if err := testSetup.Initialize(); err != nil { t.Fatalf(err.Error()) } diff --git a/test/integration/sdk/custom_cryptosuite_test.go b/test/integration/sdk/custom_cryptosuite_test.go index 86eb03c449..0e7d881353 100644 --- a/test/integration/sdk/custom_cryptosuite_test.go +++ b/test/integration/sdk/custom_cryptosuite_test.go @@ -37,7 +37,7 @@ func TestEndToEndForCustomCryptoSuite(t *testing.T) { ConnectEventHub: true, } - if err := testSetup.Initialize(t); err != nil { + if err := testSetup.Initialize(); err != nil { t.Fatalf(err.Error()) } diff --git a/test/integration/sdk/sdk_provider_test.go b/test/integration/sdk/sdk_provider_test.go index 891002dfeb..c0bdf5e2b1 100644 --- a/test/integration/sdk/sdk_provider_test.go +++ b/test/integration/sdk/sdk_provider_test.go @@ -35,7 +35,7 @@ func TestDynamicSelection(t *testing.T) { ConnectEventHub: true, } - if err := testSetup.Initialize(t); err != nil { + if err := testSetup.Initialize(); err != nil { t.Fatalf(err.Error()) }