[FAB-8491] remove def folder

Change-Id: Ic8189d7e7de3ced180bbde32d0b1e91eaa3cfa34 Signed-off-by: Troy Ronda <[email protected]>
hyperledger · Feb 24, 2018 · e213fb6 · e213fb6
1 parent 834bdb3
commit e213fb6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 137 deletions.
diff --git a/def/fabapi/deprecated.go b/def/fabapi/deprecated.go
diff --git a/pkg/fabsdk/factory/defcore/corefactory.go b/pkg/fabsdk/factory/defcore/corefactory.go
@@ -24,8 +24,6 @@ import (
 
 // ProviderFactory represents the default SDK provider factory.
 type ProviderFactory struct {
-	// stateStoreOpts is deprecated
-	stateStoreOpts StateStoreOptsDeprecated
 }
 
 // NewProviderFactory returns the default SDK provider factory.
@@ -37,14 +35,11 @@ func NewProviderFactory() *ProviderFactory {
 // CreateStateStoreProvider creates a KeyValueStore using the SDK's default implementation
 func (f *ProviderFactory) CreateStateStoreProvider(config core.Config) (contextApi.KVStore, error) {
 
-	var stateStorePath = f.stateStoreOpts.Path
-	if stateStorePath == "" {
-		clientCofig, err := config.Client()
-		if err != nil {
-			return nil, errors.WithMessage(err, "Unable to retrieve client config")
-		}
-		stateStorePath = clientCofig.CredentialStore.Path
+	clientCofig, err := config.Client()
+	if err != nil {
+		return nil, errors.WithMessage(err, "Unable to retrieve client config")
 	}
+	stateStorePath := clientCofig.CredentialStore.Path
 
 	stateStore, err := kvs.New(&kvs.FileKeyValueStoreOptions{Path: stateStorePath})
 	if err != nil {

diff --git a/pkg/fabsdk/factory/defcore/deprecated.go b/pkg/fabsdk/factory/defcore/deprecated.go
diff --git a/test/scripts/check_lint.sh b/test/scripts/check_lint.sh
@@ -16,7 +16,6 @@ GOIMPORTS_CMD=goimports
 PROJECT_PATH=$GOPATH/src/github.com/hyperledger/fabric-sdk-go
 
 declare -a arr=(
-"./def"
 "./pkg"
 "./test"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ GOIMPORTS_CMD=goimports @@
     PROJECT_PATH=$GOPATH/src/github.com/hyperledger/fabric-sdk-go
     declare -a arr=(
-    "./def"
     "./pkg"
     "./test"
     )
@@ Expand Down @@