refactor: use functional options pattern to apply skvs option

Signed-off-by: chenchanglew <lewchenchang@gmail.com>

Author: chenchanglew

ecc_go/chaincode/enclave_go/skvs_stub_interface.go

@@ -62,22 +62,18 @@ func (s *SkvsStubInterface) InitSKVS() error {
 		}
 	}
 
-	logger.Warningf("SKVS Init finish, allDataOld: %s, allDataNew: %s", s.allDataOld, s.allDataNew)
 	return nil
 }
 
 func (s *SkvsStubInterface) GetState(key string) ([]byte, error) {
-	logger.Warningf("Calling Get State (Start), key: %s, alldataOld: %s", key, s.allDataOld)
 	value, found := s.allDataOld[key]
 	if !found {
 		return nil, errors.New("skvs allDataOld key not found")
 	}
-	logger.Warningf("Calling Get State (End), key: %s, value: %x", key, value)
 	return value, nil
 }
 
 func (s *SkvsStubInterface) PutState(key string, value []byte) error {
-	logger.Warningf("Calling Put State (Start), key: %s, value: %x, alldata: %s", key, value, s.allDataNew)
 
 	s.allDataNew[key] = value
 	byteAllData, err := json.Marshal(s.allDataNew)
@@ -88,7 +84,6 @@ func (s *SkvsStubInterface) PutState(key string, value []byte) error {
 	if err != nil {
 		return err
 	}
-	logger.Warningf("Calling Put State (End), put encValue: %x", encValue)
 
 	return s.PutPublicState(s.key, encValue)
 }

ecc_go/chaincode/private.go

@@ -14,14 +14,24 @@ import (
 	"github.com/hyperledger/fabric-private-chaincode/internal/endorsement"
 )
 
+type BuildOption func(*chaincode.EnclaveChaincode, shim.Chaincode)
+
 // NewPrivateChaincode creates a new chaincode! This is for go support only!!!
-func NewPrivateChaincode(cc shim.Chaincode) *chaincode.EnclaveChaincode {
+func NewPrivateChaincode(cc shim.Chaincode, options ...BuildOption) *chaincode.EnclaveChaincode {
 	ecc := &chaincode.EnclaveChaincode{
-		Enclave:   enclave_go.NewEnclaveStub(cc),
+		Enclave:   enclave_go.NewSkvsStub(cc),
 		Validator: endorsement.NewValidator(),
 		Extractor: &chaincode.ExtractorImpl{},
 		Ercc:      &ercc.StubImpl{},
 	}
-
+	for _, o := range options {
+		o(ecc, cc)
+	}
 	return ecc
 }
+
+func WithSKVS() BuildOption {
+	return func(ecc *chaincode.EnclaveChaincode, cc shim.Chaincode) {
+		ecc.Enclave = enclave_go.NewSkvsStub(cc)
+	}
+}

ecc_go/chaincode/singleKVS.go

@@ -23,8 +23,7 @@ func main() {
 
 	// create chaincode
 	secretChaincode, _ := contractapi.NewChaincode(&chaincode.SecretKeeper{})
-	// chaincode := fpc.NewPrivateChaincode(secretChaincode)
-	skvsChaincode := fpc.NewSkvsChaincode(secretChaincode)
+	skvsChaincode := fpc.NewPrivateChaincode(secretChaincode, fpc.WithSKVS())
 
 	// start chaincode as a service
 	server := &shim.ChaincodeServer{