lexicon: have catalog constructors return ptr values

Author: bnewbold

atproto/lexicon/catalog.go

@@ -24,8 +24,8 @@ type BaseCatalog struct {
 }
 
 // Creates a new empty BaseCatalog
-func NewBaseCatalog() BaseCatalog {
-	return BaseCatalog{
+func NewBaseCatalog() *BaseCatalog {
+	return &BaseCatalog{
 		schemas: make(map[string]Schema),
 	}
 }

atproto/lexicon/cmd/lextool/net.go

@@ -73,7 +73,7 @@ func runValidateRecord(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	slog.Info("validating", "did", ident.DID.String(), "collection", aturi.Collection().String(), "rkey", aturi.RecordKey().String())
-	err = lexicon.ValidateRecord(&cat, record, aturi.Collection().String(), lexicon.LenientMode)
+	err = lexicon.ValidateRecord(cat, record, aturi.Collection().String(), lexicon.LenientMode)
 	if err != nil {
 		return err
 	}

atproto/lexicon/examples_test.go

@@ -32,7 +32,7 @@ func ExampleValidateRecord() {
 		panic("failed to parse record JSON")
 	}
 
-	if err := ValidateRecord(&cat, recordData, "example.lexicon.record", 0); err != nil {
+	if err := ValidateRecord(cat, recordData, "example.lexicon.record", 0); err != nil {
 		fmt.Printf("Schema validation failed: %v\n", err)
 	} else {
 		fmt.Println("Success!")

atproto/lexicon/interop_record_test.go

@@ -49,7 +49,7 @@ func TestInteropRecordValid(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		assert.NoError(ValidateRecord(&cat, d, "example.lexicon.record", 0))
+		assert.NoError(ValidateRecord(cat, d, "example.lexicon.record", 0))
 	}
 }
 
@@ -83,7 +83,7 @@ func TestInteropRecordInvalid(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		err = ValidateRecord(&cat, d, "example.lexicon.record", 0)
+		err = ValidateRecord(cat, d, "example.lexicon.record", 0)
 		if err == nil {
 			fmt.Println("   FAIL")
 		}

atproto/lexicon/resolving_catalog.go

@@ -12,12 +12,12 @@ import (
 
 // Catalog which supplements an in-memory BaseCatalog with live resolution from the network
 type ResolvingCatalog struct {
-	Base      BaseCatalog
+	Base      *BaseCatalog
 	Directory identity.Directory
 }
 
-func NewResolvingCatalog() ResolvingCatalog {
-	return ResolvingCatalog{
+func NewResolvingCatalog() *ResolvingCatalog {
+	return &ResolvingCatalog{
 		Base:      NewBaseCatalog(),
 		Directory: identity.DefaultDirectory(),
 	}

atproto/lexicon/validation_test.go

@@ -19,7 +19,7 @@ func TestBasicCatalog(t *testing.T) {
 		t.Fatal(err)
 	}
 	assert.NoError(validateData(
-		&cat,
+		cat,
 		def.Def,
 		map[string]any{
 			"cid": "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",
@@ -33,7 +33,7 @@ func TestBasicCatalog(t *testing.T) {
 	))
 
 	assert.Error(validateData(
-		&cat,
+		cat,
 		def.Def,
 		map[string]any{
 			"cid": "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",