[FAB-8107] Move api/apicore to pkg/fabsdk/api

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

Author: troyronda

api/apiconfig/mocks/mockconfig.gen.go

@@ -11,12 +11,12 @@ import (
 	"time"
 
 	config "github.com/hyperledger/fabric-sdk-go/api/apiconfig"
-	"github.com/hyperledger/fabric-sdk-go/api/apicore"
 	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
 	resmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/resmgmtclient"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/peer"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/txn"
+	"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/api"
 	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
 	"github.com/pkg/errors"
 )
@@ -29,7 +29,7 @@ type ResourceMgmtClient struct {
 	identity          fab.IdentityContext
 	discoveryProvider fab.DiscoveryProvider // used to get per channel discovery service(s)
 	channelProvider   fab.ChannelProvider
-	fabricProvider    apicore.FabricProvider
+	fabricProvider    api.FabricProvider
 	discovery         fab.DiscoveryService // global discovery service (detects all peers on the network)
 	resource          fab.Resource
 	filter            resmgmt.TargetFilter
@@ -60,7 +60,7 @@ type Context struct {
 	fab.IdentityContext
 	DiscoveryProvider fab.DiscoveryProvider
 	ChannelProvider   fab.ChannelProvider
-	FabricProvider    apicore.FabricProvider
+	FabricProvider    api.FabricProvider
 	Resource          fab.Resource
 }
 

api/apifabca/mocks/mockfabriccaclient.gen.go

@@ -8,7 +8,6 @@ package api
 
 import (
 	"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
-	"github.com/hyperledger/fabric-sdk-go/api/apicore"
 	"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
 	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
 	"github.com/hyperledger/fabric-sdk-go/api/kvstore"
@@ -26,7 +25,7 @@ type CoreProviders interface {
 	StateStore() kvstore.KVStore
 	Config() apiconfig.Config
 	SigningManager() fab.SigningManager
-	FabricProvider() apicore.FabricProvider
+	FabricProvider() FabricProvider
 }
 
 // SvcProviders represents the SDK configured service providers context.

api/apifabclient/mocks/mockfabclient.gen.go

@@ -8,7 +8,6 @@ package api
 
 import (
 	"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
-	"github.com/hyperledger/fabric-sdk-go/api/apicore"
 	"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
 	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
 	"github.com/hyperledger/fabric-sdk-go/api/apilogging"
@@ -23,7 +22,7 @@ type CoreProviderFactory interface {
 	NewStateStoreProvider(config apiconfig.Config) (kvstore.KVStore, error)
 	NewCryptoSuiteProvider(config apiconfig.Config) (apicryptosuite.CryptoSuite, error)
 	NewSigningManager(cryptoProvider apicryptosuite.CryptoSuite, config apiconfig.Config) (fab.SigningManager, error)
-	NewFabricProvider(context fab.ProviderContext) (apicore.FabricProvider, error)
+	NewFabricProvider(context fab.ProviderContext) (FabricProvider, error)
 }
 
 // ServiceProviderFactory allows overriding default service providers (such as peer discovery)