Merge branch 'main' into fix/auditor-check-inputs-and-recipients

Author: Storm1289

token/services/auditor/mock/audit_transaction_store.go

@@ -56,6 +56,11 @@ func (m *Configuration) Validate() error {
 	return nil
 }
 
+// SetValidators sets the validators for this configuration.
+func (m *Configuration) SetValidators(validators []Validator) {
+	m.validators = validators
+}
+
 func (m *Configuration) ID() driver.TMSID {
 	return m.tmsID
 }

token/services/config/configuration.go

@@ -0,0 +1,115 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package config_test
+
+import (
+	"testing"
+
+	"github.com/hyperledger-labs/fabric-token-sdk/token"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/config"
+	"github.com/hyperledger-labs/fabric-token-sdk/token/services/config/mocks"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestConfiguration_Validate(t *testing.T) {
+	cp := &mocks.Provider{}
+	tmsID := driver.TMSID{Network: "net", Channel: "ch", Namespace: "ns"}
+	c := config.NewConfiguration(cp, "id", tmsID)
+
+	// Valid
+	err := c.Validate()
+	require.NoError(t, err)
+
+	// Missing Network
+	tmsID.Network = ""
+	c = config.NewConfiguration(cp, "id", tmsID)
+	err = c.Validate()
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "missing required field 'network'")
+
+	// Missing Namespace
+	tmsID.Network = "net"
+	tmsID.Namespace = ""
+	c = config.NewConfiguration(cp, "id", tmsID)
+	err = c.Validate()
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "missing required field 'namespace'")
+
+	// Custom Validator
+	tmsID.Namespace = "ns"
+	c = config.NewConfiguration(cp, "id", tmsID)
+	validator := &mocks.Validator{}
+	c.SetValidators([]config.Validator{validator})
+
+	validator.ValidateReturns(nil)
+	err = c.Validate()
+	require.NoError(t, err)
+	assert.Equal(t, 1, validator.ValidateCallCount())
+
+	validator.ValidateReturns(assert.AnError)
+	err = c.Validate()
+	require.Error(t, err)
+	assert.Equal(t, 2, validator.ValidateCallCount())
+}
+
+func TestConfiguration_Serialize(t *testing.T) {
+	cp := &mocks.Provider{}
+	tmsID := driver.TMSID{Network: "net", Channel: "ch", Namespace: "ns"}
+	c := config.NewConfiguration(cp, "old_id", tmsID)
+
+	// Test Unmarshal Error
+	cp.UnmarshalKeyReturns(assert.AnError)
+	_, err := c.Serialize(token.TMSID{Network: "new"})
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "failed unmarshalling key")
+
+	// Test Success
+	cp.UnmarshalKeyStub = func(key string, rawVal interface{}) error {
+		*rawVal.(*map[string]any) = map[string]any{"key": "value"}
+
+		return nil
+	}
+	raw, err := c.Serialize(token.TMSID{Network: "new_net", Channel: "new_ch", Namespace: "new_ns"})
+	require.NoError(t, err)
+	assert.NotEmpty(t, raw)
+	assert.Contains(t, string(raw), "new_net")
+	assert.Contains(t, string(raw), "new_ch")
+	assert.Contains(t, string(raw), "new_ns")
+}
+
+func TestConfiguration_Wrappers(t *testing.T) {
+	cp := &mocks.Provider{}
+	tmsID := driver.TMSID{Network: "net", Channel: "ch", Namespace: "ns"}
+	c := config.NewConfiguration(cp, "id", tmsID)
+
+	// ID
+	assert.Equal(t, tmsID, c.ID())
+
+	// TranslatePath
+	cp.TranslatePathReturns("translated")
+	assert.Equal(t, "translated", c.TranslatePath("path"))
+
+	// UnmarshalKey
+	cp.UnmarshalKeyReturns(nil)
+	err := c.UnmarshalKey("key", nil)
+	require.NoError(t, err)
+	assert.Equal(t, 1, cp.UnmarshalKeyCallCount())
+
+	// GetString
+	cp.GetStringReturns("string")
+	assert.Equal(t, "string", c.GetString("key"))
+
+	// GetBool
+	cp.GetBoolReturns(true)
+	assert.True(t, c.GetBool("key"))
+
+	// IsSet
+	cp.IsSetReturns(true)
+	assert.True(t, c.IsSet("key"))
+}

token/services/config/configuration_unit_test.go

@@ -0,0 +1,11 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package config
+
+//go:generate counterfeiter -o mocks/provider.go -fake-name Provider . Provider
+//go:generate counterfeiter -o mocks/validate_configuration.go -fake-name ValidateConfiguration . ValidateConfiguration
+//go:generate counterfeiter -o mocks/validator.go -fake-name Validator . Validator