repo: return bytes and CID from GetRecordBytes

Author: bnewbold

atproto/repo/repo.go

@@ -48,17 +48,17 @@ func (repo *Repo) GetRecordCID(ctx context.Context, collection syntax.NSID, rkey
 	return c, nil
 }
 
-func (repo *Repo) GetRecordBytes(ctx context.Context, collection syntax.NSID, rkey syntax.RecordKey) ([]byte, error) {
+func (repo *Repo) GetRecordBytes(ctx context.Context, collection syntax.NSID, rkey syntax.RecordKey) ([]byte, *cid.Cid, error) {
 	c, err := repo.GetRecordCID(ctx, collection, rkey)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	blk, err := repo.RecordStore.Get(ctx, *c)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	// TODO: not verifying CID
-	return blk.RawData(), nil
+	return blk.RawData(), c, nil
 }
 
 // Snapshots the current state of the repository, resulting in a new (unsigned) `Commit` struct.

atproto/repo/sync.go

@@ -61,17 +61,14 @@ func VerifyCommitMessage(ctx context.Context, msg *comatproto.SyncSubscribeRepos
 			if err != nil {
 				return nil, fmt.Errorf("invalid repo path in ops list: %w", err)
 			}
-			val, err := repo.GetRecordCID(ctx, nsid, rkey)
+			// don't use the returned bytes, but do actually read them out of store (not just CID)
+			_, val, err := repo.GetRecordBytes(ctx, nsid, rkey)
 			if err != nil {
 				return nil, err
 			}
 			if *c != *val {
 				return nil, fmt.Errorf("record op doesn't match MST tree value")
 			}
-			_, err = repo.GetRecordBytes(ctx, nsid, rkey)
-			if err != nil {
-				return nil, err
-			}
 		}
 	}