Second branch

cmd/firefly.go

@@ -83,7 +83,6 @@ func init() {
 }
 
 func resetConfig() {
-	coreconfig.Reset()
 	namespace.InitConfig()
 	apiserver.InitConfig()
 }

doc-site/config_docs_generate_test.go

@@ -34,7 +34,6 @@ import (
 
 func TestGenerateConfigDocs(t *testing.T) {
 	// Initialize config of all plugins
-	coreconfig.Reset()
 	namespace.InitConfig()
 	apiserver.InitConfig()
 	f, err := os.Create(filepath.Join("docs", "reference", "config.md"))

doc-site/config_docs_test.go

@@ -35,7 +35,6 @@ import (
 
 func TestConfigDocsUpToDate(t *testing.T) {
 	// Initialize config of all plugins
-	coreconfig.Reset()
 	namespace.InitConfig()
 	apiserver.InitConfig()
 	generatedConfig, err := config.GenerateConfigMarkdown(context.Background(), configDocHeader, config.GetKnownKeys())

go.mod

@@ -17,7 +17,11 @@ require (
 	github.com/golang-migrate/migrate/v4 v4.17.0
 	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/websocket v1.5.1
+<<<<<<< HEAD
+	github.com/hyperledger/firefly-common v1.4.14
+=======
 	github.com/hyperledger/firefly-common v1.4.15
+>>>>>>> b4d7987111328448ef17752c2785b42fb31c8478
 	github.com/hyperledger/firefly-signer v1.1.19
 	github.com/jarcoal/httpmock v1.2.0
 	github.com/lib/pq v1.10.9

internal/apiserver/server_test.go

@@ -53,7 +53,6 @@ import (
 const configDir = "../../test/data/config"
 
 func newTestServer() (*namespacemocks.Manager, *orchestratormocks.Orchestrator, *apiServer) {
-	coreconfig.Reset()
 	InitConfig()
 	mgr := &namespacemocks.Manager{}
 	o := &orchestratormocks.Orchestrator{}
@@ -81,7 +80,6 @@ func newTestSPIServer() (*orchestratormocks.Orchestrator, *mux.Router) {
 }
 
 func TestStartStopServer(t *testing.T) {
-	coreconfig.Reset()
 	metrics.Clear()
 	InitConfig()
 	apiConfig.Set(httpserver.HTTPConfPort, 0)
@@ -100,7 +98,6 @@ func TestStartStopServer(t *testing.T) {
 }
 
 func TestStartLegacyAdminConfig(t *testing.T) {
-	coreconfig.Reset()
 	metrics.Clear()
 	InitConfig()
 	apiConfig.Set(httpserver.HTTPConfPort, 0)
@@ -119,7 +116,6 @@ func TestStartLegacyAdminConfig(t *testing.T) {
 }
 
 func TestStartAPIFail(t *testing.T) {
-	coreconfig.Reset()
 	metrics.Clear()
 	InitConfig()
 	apiConfig.Set(httpserver.HTTPConfAddress, "...://")
@@ -132,7 +128,6 @@ func TestStartAPIFail(t *testing.T) {
 }
 
 func TestStartAdminFail(t *testing.T) {
-	coreconfig.Reset()
 	metrics.Clear()
 	InitConfig()
 	spiConfig.Set(httpserver.HTTPConfAddress, "...://")
@@ -148,7 +143,6 @@ func TestStartAdminFail(t *testing.T) {
 }
 
 func TestStartAdminWSHandler(t *testing.T) {
-	coreconfig.Reset()
 	metrics.Clear()
 	InitConfig()
 	spiConfig.Set(httpserver.HTTPConfAddress, "...://")
@@ -167,7 +161,6 @@ func TestStartAdminWSHandler(t *testing.T) {
 }
 
 func TestStartMetricsFail(t *testing.T) {
-	coreconfig.Reset()
 	metrics.Clear()
 	InitConfig()
 	monitoringConfig.Set(httpserver.HTTPConfAddress, "...://")

internal/apiserver/swagger_check_test.go

@@ -38,7 +38,6 @@ import (
 )
 
 func TestDiffSwaggerYAML(t *testing.T) {
-	coreconfig.Reset()
 	config.Set(coreconfig.APIOASPanicOnMissingDescription, true)
 	as := &apiServer{}
 	hf := as.handlerFactory()

internal/apiserver/swagger_generate_test.go

@@ -37,7 +37,6 @@ import (
 )
 
 func TestDownloadSwaggerYAML(t *testing.T) {
-	coreconfig.Reset()
 	config.Set(coreconfig.APIOASPanicOnMissingDescription, true)
 	as := &apiServer{}
 	hf := as.handlerFactory()

internal/assets/manager_test.go

@@ -53,7 +53,6 @@ func newTestAssetsWithMetrics(t *testing.T) (*assetManager, func()) {
 }
 
 func newTestAssetsCommon(t *testing.T, metrics bool) (*assetManager, func()) {
-	coreconfig.Reset()
 	mdi := &databasemocks.Plugin{}
 	mim := &identitymanagermocks.Manager{}
 	mdm := &datamocks.Manager{}
@@ -91,7 +90,6 @@ func TestInitFail(t *testing.T) {
 
 func TestCacheInitFail(t *testing.T) {
 	cacheInitError := errors.New("Initialization error.")
-	coreconfig.Reset()
 	mdi := &databasemocks.Plugin{}
 	mdm := &datamocks.Manager{}
 	mim := &identitymanagermocks.Manager{}
@@ -163,7 +161,6 @@ func TestGetTokenConnectors(t *testing.T) {
 }
 
 func TestStart(t *testing.T) {
-	coreconfig.Reset()
 	mdi := &databasemocks.Plugin{}
 	mdm := &datamocks.Manager{}
 	mim := &identitymanagermocks.Manager{}
@@ -193,7 +190,6 @@ func TestStart(t *testing.T) {
 }
 
 func TestStartDBError(t *testing.T) {
-	coreconfig.Reset()
 	mdi := &databasemocks.Plugin{}
 	mdm := &datamocks.Manager{}
 	mim := &identitymanagermocks.Manager{}
@@ -216,7 +212,6 @@ func TestStartDBError(t *testing.T) {
 }
 
 func TestStartError(t *testing.T) {
-	coreconfig.Reset()
 	mdi := &databasemocks.Plugin{}
 	mdm := &datamocks.Manager{}
 	mim := &identitymanagermocks.Manager{}

internal/batch/batch_manager_test.go

@@ -40,7 +40,6 @@ import (
 )
 
 func testConfigReset() {
-	coreconfig.Reset()
 	config.Set(coreconfig.BatchManagerMinimumPollDelay, "0")
 	log.SetLevel("debug")
 }

internal/batch/batch_processor_test.go

@@ -89,7 +89,6 @@ func (tce *testConflictError) IsConflictError() bool {
 
 func TestUnfilledBatch(t *testing.T) {
 	log.SetLevel("debug")
-	coreconfig.Reset()
 
 	dispatched := make(chan *DispatchPayload)
 	cancel, mdi, bp := newTestBatchProcessor(t, func(c context.Context, state *DispatchPayload) error {
@@ -154,7 +153,6 @@ func TestHandleDispatchConflictError(t *testing.T) {
 
 func TestBatchSizeOverflow(t *testing.T) {
 	log.SetLevel("debug")
-	coreconfig.Reset()
 
 	dispatched := make(chan *DispatchPayload)
 	cancel, mdi, bp := newTestBatchProcessor(t, func(c context.Context, state *DispatchPayload) error {
@@ -553,7 +551,6 @@ func TestStartQuiesceNonBlocking(t *testing.T) {
 
 func TestMarkMessageDispatchedUnpinnedOK(t *testing.T) {
 	log.SetLevel("debug")
-	coreconfig.Reset()
 
 	dispatched := make(chan *DispatchPayload)
 	cancel, mdi, bp := newTestBatchProcessor(t, func(c context.Context, state *DispatchPayload) error {
@@ -611,7 +608,6 @@ func TestMarkMessageDispatchedUnpinnedOK(t *testing.T) {
 
 func TestMaskContextsRetryAfterPinsAssigned(t *testing.T) {
 	log.SetLevel("debug")
-	coreconfig.Reset()
 
 	dispatched := make(chan *DispatchPayload)
 	cancel, mdi, bp := newTestBatchProcessor(t, func(c context.Context, state *DispatchPayload) error {
@@ -681,7 +677,6 @@ func TestMaskContextsRetryAfterPinsAssigned(t *testing.T) {
 
 func TestMaskContextsUpdateMessageFail(t *testing.T) {
 	log.SetLevel("debug")
-	coreconfig.Reset()
 
 	dispatched := make(chan *DispatchPayload)
 	cancel, mdi, bp := newTestBatchProcessor(t, func(c context.Context, state *DispatchPayload) error {
@@ -720,7 +715,6 @@ func TestMaskContextsUpdateMessageFail(t *testing.T) {
 }
 
 func TestSealBatchTXAlreadyAssigned(t *testing.T) {
-	coreconfig.Reset()
 
 	dispatched := make(chan *DispatchPayload)
 	cancel, mdi, bp := newTestBatchProcessor(t, func(c context.Context, state *DispatchPayload) error {
@@ -831,7 +825,6 @@ func TestCalculateContextsLoadPinsFail(t *testing.T) {
 
 func TestBigBatchEstimate(t *testing.T) {
 	log.SetLevel("debug")
-	coreconfig.Reset()
 
 	bd := []byte(`{
 		"id": "37ba893b-fcfa-4cf9-8ce8-34cd8bc9bc72",

internal/blockchain/ethereum/address_resolver_test.go

@@ -39,7 +39,6 @@ import (
 )
 
 func utAddresResolverConfig() config.Section {
-	coreconfig.Reset()
 	config := config.RootSection("utaddressresovler")
 	(&Ethereum{}).InitConfig(config)
 	return config.SubSection(AddressResolverConfigKey)

internal/blockchain/ethereum/ethereum_test.go

@@ -113,7 +113,6 @@ func testFFIErrors() []*fftypes.FFIError {
 }
 
 func resetConf(e *Ethereum) {
-	coreconfig.Reset()
 	e.InitConfig(utConfig)
 }
 

internal/blockchain/fabric/fabric_test.go

@@ -57,7 +57,6 @@ var (
 )
 
 func resetConf(e *Fabric) {
-	coreconfig.Reset()
 	e.InitConfig(utConfig)
 }
 

internal/blockchain/tezos/address_resolver_test.go

@@ -38,7 +38,6 @@ import (
 )
 
 func utAddresResolverConfig() config.Section {
-	coreconfig.Reset()
 	config := config.RootSection("utaddressresovler")
 	(&Tezos{}).InitConfig(config)
 	return config.SubSection(AddressResolverConfigKey)

internal/blockchain/tezos/tezos_test.go

@@ -89,7 +89,6 @@ func testFFIMethod() *fftypes.FFIMethod {
 }
 
 func resetConf(t *Tezos) {
-	coreconfig.Reset()
 	t.InitConfig(utConfig)
 }
 

internal/broadcast/manager_test.go

@@ -46,7 +46,6 @@ import (
 )
 
 func newTestBroadcastCommon(t *testing.T, metricsEnabled bool) (*broadcastManager, func()) {
-	coreconfig.Reset()
 	mdi := &databasemocks.Plugin{}
 	mim := &identitymanagermocks.Manager{}
 	mdm := &datamocks.Manager{}

internal/cache/cache_test.go

@@ -27,7 +27,6 @@ import (
 )
 
 func TestNewCacheCreationFail(t *testing.T) {
-	coreconfig.Reset()
 	ctx := context.Background()
 	cacheManager := NewCacheManager(ctx)
 	_, err := cacheManager.GetCache(NewCacheConfig(ctx, "", "", ""))
@@ -41,7 +40,6 @@ func TestNewCacheCreationFail(t *testing.T) {
 }
 
 func TestGetCacheReturnsSameCacheForSameConfig(t *testing.T) {
-	coreconfig.Reset()
 	ctx := context.Background()
 	cacheManager := NewCacheManager(ctx)
 	cache0, _ := cacheManager.GetCache(NewCacheConfig(ctx, "cache.batch.limit", "cache.batch.ttl", "testnamespace"))
@@ -57,7 +55,6 @@ func TestGetCacheReturnsSameCacheForSameConfig(t *testing.T) {
 }
 
 func TestTwoSeparateCacheWorksIndependently(t *testing.T) {
-	coreconfig.Reset()
 	ctx := context.Background()
 	cacheManager := NewCacheManager(ctx)
 	cache0, _ := cacheManager.GetCache(NewCacheConfig(ctx, "cache.batch.limit", "cache.batch.ttl", ""))
@@ -77,7 +74,6 @@ func TestTwoSeparateCacheWorksIndependently(t *testing.T) {
 }
 
 func TestReturnsDummyCacheWhenCacheDisabled(t *testing.T) {
-	coreconfig.Reset()
 	config.Set(coreconfig.CacheEnabled, false)
 	ctx := context.Background()
 	cacheManager := NewCacheManager(ctx)
@@ -93,7 +89,6 @@ func TestUmmanagedCacheInstance(t *testing.T) {
 }
 
 func TestResetCachesForNamespace(t *testing.T) {
-	coreconfig.Reset()
 	ctx := context.Background()
 	cacheManager := NewCacheManager(ctx)
 	cacheNS1, _ := cacheManager.GetCache(NewCacheConfig(ctx, "cache.batch.limit", "cache.batch.ttl", "ns1"))

internal/coreconfig/coreconfig.go

@@ -479,7 +479,3 @@ func setDefaults() {
 	viper.SetDefault(string(CacheTokenPoolLimit), 100)
 	viper.SetDefault(string(CacheTokenPoolTTL), "1h")
 }
-
-func Reset() {
-	config.RootConfigReset(setDefaults)
-}

internal/coreconfig/coreconfig_test.go

@@ -26,7 +26,6 @@ import (
 const configDir = "../../test/data/config"
 
 func TestInitConfigOK(t *testing.T) {
-	Reset()
 
 	assert.Equal(t, 25, config.GetInt(APIDefaultFilterLimit))
 	assert.Equal(t, "localhost", config.GetString(DebugAddress))

internal/data/data_manager_test.go

@@ -40,7 +40,6 @@ import (
 
 func TestCacheInitFail(t *testing.T) {
 	cacheInitError := errors.New("Initialization error.")
-	coreconfig.Reset()
 	config.Set(coreconfig.MessageWriterCount, 1)
 	ctx := context.Background()
 	mdi := &databasemocks.Plugin{}
@@ -80,7 +79,6 @@ func TestCacheInitFail(t *testing.T) {
 }
 
 func newTestDataManager(t *testing.T) (*dataManager, context.Context, func()) {
-	coreconfig.Reset()
 	config.Set(coreconfig.MessageWriterCount, 1)
 	ctx, cancel := context.WithCancel(context.Background())
 	mdi := &databasemocks.Plugin{}
@@ -134,7 +132,6 @@ func testNewMessage() (*fftypes.UUID, *fftypes.Bytes32, *NewMessage) {
 
 func TestValidateE2E(t *testing.T) {
 
-	coreconfig.Reset()
 	dm, ctx, cancel := newTestDataManager(t)
 	defer cancel()
 	mdi := dm.database.(*databasemocks.Plugin)
@@ -281,7 +278,6 @@ func TestInitBadDeps(t *testing.T) {
 }
 
 func TestValidatorLookupCached(t *testing.T) {
-	coreconfig.Reset()
 	dm, ctx, cancel := newTestDataManager(t)
 	defer cancel()
 	mdi := dm.database.(*databasemocks.Plugin)
@@ -309,7 +305,6 @@ func TestValidatorLookupCached(t *testing.T) {
 
 func TestValidateBadHash(t *testing.T) {
 
-	coreconfig.Reset()
 	dm, ctx, cancel := newTestDataManager(t)
 	defer cancel()
 	mdi := dm.database.(*databasemocks.Plugin)

internal/database/sqlcommon/chart_sql_test.go

@@ -135,7 +135,6 @@ func TestGetChartHistogramValidCollectionNameWithTypes(t *testing.T) {
 
 func TestGetChartHistogramValidCollectionNameWithTypesAndCapped(t *testing.T) {
 	s, mock := newMockProvider().init()
-	coreconfig.Reset()
 	config.Set(coreconfig.HistogramsMaxChartRows, 10)
 	for i := range validCollectionsWithTypes {
 		mock.ExpectQuery("SELECT .*").WillReturnRows(sqlmock.NewRows([]string{"timestamp", "type"}).

internal/database/sqlcommon/provider_mock_test.go

@@ -49,7 +49,6 @@ type mockProvider struct {
 }
 
 func newMockProvider() *mockProvider {
-	coreconfig.Reset()
 	conf := config.RootSection("unittest.db")
 	conf.AddKnownKey("url", "test")
 	mp := &mockProvider{