FAB-8101 - .json file extension with filekeyvaluestore

FAB-7513 (change https://gerrit.hyperledger.org/r/#/c/17547/ )
changed the default file extension of the new files produced by
the filekeyvaluestore. Previously it was ".json", and now there
is no extension (the key becomes the filename). This ticket
demonstrates how to construct a new filekeyvaluestore that adds
".json" to the store file names, to keep compatibility with
previously created stores.

Change-Id: Iddd20a78f941d2d8449e3ef8a970c6d89ba8c8d2
Signed-off-by: Aleksandar Likic <aleksandar.likic@securekey.com>

Author: Aleksandar Likic

pkg/fabric-client/client_test.go

@@ -8,9 +8,11 @@ package fabricclient
 
 import (
 	"bytes"
+	"path"
 	"testing"
 
 	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
+	"github.com/pkg/errors"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
 	kvs "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/keyvaluestore"
@@ -85,7 +87,17 @@ func TestClientMethods(t *testing.T) {
 		t.Fatalf("client.NewChain create wrong chain")
 	}
 
-	stateStore, err := kvs.NewFileKeyValueStore(&kvs.FileKeyValueStoreOptions{Path: "/tmp/keyvaluestore"})
+	stateStorePath := "/tmp/keyvaluestore"
+	stateStore, err := kvs.NewFileKeyValueStore(&kvs.FileKeyValueStoreOptions{
+		Path: stateStorePath,
+		KeySerializer: func(key interface{}) (string, error) {
+			keyString, ok := key.(string)
+			if !ok {
+				return "", errors.New("converting key to string failed")
+			}
+			return path.Join(stateStorePath, keyString+".json"), nil
+		},
+	})
 	if err != nil {
 		t.Fatalf("CreateNewFileKeyValueStore return error[%s]", err)
 	}

test/integration/fab/fabric_ca_test.go

@@ -10,7 +10,9 @@ import (
 	"bytes"
 	"crypto/x509"
 	"encoding/pem"
+	"errors"
 	"math/rand"
+	"path"
 	"strconv"
 	"testing"
 	"time"
@@ -53,9 +55,17 @@ func TestRegisterEnrollRevoke(t *testing.T) {
 		t.Fatalf("Failed getting cryptosuite from config : %s", err)
 	}
 
+	stateStorePath := "/tmp/enroll_user"
 	client.SetCryptoSuite(cryptoSuiteProvider)
 	stateStore, err := kvs.NewFileKeyValueStore(&kvs.FileKeyValueStoreOptions{
-		Path: "/tmp/enroll_user",
+		Path: stateStorePath,
+		KeySerializer: func(key interface{}) (string, error) {
+			keyString, ok := key.(string)
+			if !ok {
+				return "", errors.New("converting key to string failed")
+			}
+			return path.Join(stateStorePath, keyString+".json"), nil
+		},
 	})
 	if err != nil {
 		t.Fatalf("CreateNewFileKeyValueStore return error[%s]", err)