From 11d861fab4515a6ee10a9efeae9aa6b0e6f0d36e Mon Sep 17 00:00:00 2001
From: Khosrow Afroozeh <parshua@gmail.com>
Date: Thu, 28 Nov 2024 17:31:20 +0100
Subject: [PATCH] Reverts nil handling in Key

---
 key.go        | 11 +----------
 key_helper.go | 16 ----------------
 key_test.go   |  5 +----
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/key.go b/key.go
index 0b526959..3b62bf0d 100644
--- a/key.go
+++ b/key.go
@@ -112,19 +112,10 @@ func NewKey(namespace string, setName string, key interface{}) (*Key, Error) {
 // NewKeyWithDigest initializes a key from namespace, optional set name and user key.
 // The server handles record identifiers by digest only.
 func NewKeyWithDigest(namespace string, setName string, key interface{}, digest []byte) (*Key, Error) {
-	var userKey Value = nil
-	if key != nil {
-		userKey = NewValue(key)
-		// make sure the key type is valid
-		if err := verifyKey(userKey); err != nil {
-			return nil, err
-		}
-	}
-
 	newKey := &Key{
 		namespace: namespace,
 		setName:   setName,
-		userKey:   userKey,
+		userKey:   NewValue(key),
 	}
 
 	if err := newKey.SetDigest(digest); err != nil {
diff --git a/key_helper.go b/key_helper.go
index 82dc459a..f237fc89 100644
--- a/key_helper.go
+++ b/key_helper.go
@@ -153,19 +153,3 @@ func (vb *keyWriter) writeKey(val Value) Error {
 	// TODO: Replace the error message with fmt.Sprintf("Key Generation Error. Value type not supported: %T", val)
 	return newError(types.PARAMETER_ERROR, "Key Generation Error. Value not supported: "+val.String())
 }
-
-func verifyKey(val Value) Error {
-	switch val.(type) {
-	case IntegerValue:
-		return nil
-	case LongValue:
-		return nil
-	case StringValue:
-		return nil
-	case BytesValue:
-		return nil
-	}
-
-	// TODO: Replace the error message with fmt.Sprintf("Key Generation Error. Value type not supported: %T", val)
-	return newError(types.PARAMETER_ERROR, "Key Generation Error. Value not supported: "+val.String())
-}
diff --git a/key_test.go b/key_test.go
index b752a609..541e80e5 100644
--- a/key_test.go
+++ b/key_test.go
@@ -132,10 +132,7 @@ var _ = gg.Describe("Key Test", func() {
 			gm.Expect(err, nil)
 			gm.Expect(key.Digest()).To(gm.Equal([]byte("01234567890123456789")))
 
-			key, err = as.NewKeyWithDigest("namespace", "set", []interface{}{}, []byte("01234567890123456789"))
-			gm.Expect(err).To(gm.HaveOccurred())
-
-			key, err = as.NewKeyWithDigest("namespace", "set", nil, []byte("01234567890123456789"))
+			key, _ = as.NewKeyWithDigest("namespace", "set", []interface{}{}, []byte("01234567890123456789"))
 			gm.Expect(key.Digest()).To(gm.Equal([]byte("01234567890123456789")))
 		})