Some review Comments

Signed-off-by: Yogesh Deshpande <[email protected]>

Author: yogeshbdeshpande

cmw.go

@@ -153,6 +153,8 @@ func (o CMW) GetCollectionItem(key any) (*CMW, error) {
 	return o.collection.getItem(key)
 }
 
+// ValidateCollection is now deprecated
+// use Valid() instead
 func (o CMW) ValidateCollection() error {
 	if o.kind != KindCollection {
 		return fmt.Errorf("want collection, got %q", o.kind)
@@ -166,7 +168,7 @@ func (o CMW) Valid() error {
 	case KindMonad:
 		return o.monad.valid()
 	case KindCollection:
-		return o.ValidateCollection()
+		return o.validate()
 	default:
 		return fmt.Errorf("unknown kind: %s", o.kind.String())
 	}

collection.go

@@ -30,11 +30,17 @@ func (o collection) validate() error {
 	}
 
 	for k, v := range o.cmap {
-		if v.kind != KindCollection {
-			continue
-		}
-		if err := v.validate(); err != nil {
-			return fmt.Errorf("invalid collection at key %q: %w", k, err)
+		switch v.kind {
+		case KindMonad:
+			if err := v.monad.valid(); err != nil {
+				return fmt.Errorf("invalid monad at key %q: %w", k, err)
+			}
+		case KindCollection:
+			if err := v.validate(); err != nil {
+				return fmt.Errorf("invalid collection at key %q: %w", k, err)
+			}
+		default:
+			return fmt.Errorf("invalid kind niether monad nor collection:  %s", v.kind.String())
 		}
 	}
 

example_test.go

@@ -147,10 +147,7 @@ func Example_roundtrip_JSON_collection() {
 	if err != nil {
 		log.Fatalf("unmarshal JSON collection failed: %v", err)
 	}
-	err = o.ValidateCollection()
-	if err != nil {
-		log.Fatalf("validate JSON collection failed: %v", err)
-	}
+
 	b, err := o.MarshalJSON()
 	if err != nil {
 		log.Fatalf("marshal collection to JSON failed: %v", err)

monad.go

@@ -29,7 +29,7 @@ func (o *monad) UnmarshalJSON(b []byte) error {
 
 	o.format = FormatJSONRecord
 
-	return o.valid()
+	return nil
 }
 
 func (o monad) MarshalCBOR() ([]byte, error) {
@@ -60,7 +60,7 @@ func (o *monad) UnmarshalCBOR(b []byte) error {
 		panic(fmt.Sprintf("want CBOR Tag or CBOR array, got 0x%02x", b[0]))
 	}
 
-	return o.valid()
+	return nil
 }
 
 func (o monad) valid() error {

monad_test.go

@@ -88,8 +88,6 @@ func Test_Deserialize_monad_ok(t *testing.T) {
 
 			err := actual.Deserialize(tt.tv)
 			assert.NoError(t, err)
-			err = actual.monad.valid()
-			assert.NoError(t, err)
 			assert.Equal(t, KindMonad, actual.GetKind())
 			assert.Equal(t, tt.exp.format, actual.GetFormat())
 			assert.Equal(t, tt.exp, actual.monad)