From 487e85b183d78bdbdbe2cf80ed721c5af8d674ce Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Mon, 21 Oct 2024 13:02:33 -0400
Subject: [PATCH] Adjustments after running `fieldalignment -fix
 github.com/authzed/spicedb/pkg/tuple`

---
 pkg/tuple/comparison_test.go | 2 +-
 pkg/tuple/core_test.go       | 4 ++--
 pkg/tuple/structs.go         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/tuple/comparison_test.go b/pkg/tuple/comparison_test.go
index d06c506dd3..53d3144219 100644
--- a/pkg/tuple/comparison_test.go
+++ b/pkg/tuple/comparison_test.go
@@ -81,9 +81,9 @@ func TestEqual(t *testing.T) {
 	}
 
 	notEqualTestCases := []struct {
-		name string
 		lhs  Relationship
 		rhs  Relationship
+		name string
 	}{
 		{
 			name: "Mismatch Resource Type",
diff --git a/pkg/tuple/core_test.go b/pkg/tuple/core_test.go
index d6f3600722..3b2bf9986d 100644
--- a/pkg/tuple/core_test.go
+++ b/pkg/tuple/core_test.go
@@ -10,11 +10,11 @@ import (
 
 func TestONRStringToCore(t *testing.T) {
 	tests := []struct {
+		expected *core.ObjectAndRelation
 		name     string
 		ns       string
 		oid      string
 		rel      string
-		expected *core.ObjectAndRelation
 	}{
 		{
 			name: "basic",
@@ -39,10 +39,10 @@ func TestONRStringToCore(t *testing.T) {
 
 func TestRelationReference(t *testing.T) {
 	tests := []struct {
+		expected *core.RelationReference
 		name     string
 		ns       string
 		rel      string
-		expected *core.RelationReference
 	}{
 		{
 			name: "basic",
diff --git a/pkg/tuple/structs.go b/pkg/tuple/structs.go
index 1734161731..3a520d6637 100644
--- a/pkg/tuple/structs.go
+++ b/pkg/tuple/structs.go
@@ -67,9 +67,9 @@ type RelationshipReference struct {
 
 // Relationship represents a relationship between two objects.
 type Relationship struct {
-	RelationshipReference
 	OptionalCaveat    *core.ContextualizedCaveat
 	OptionalIntegrity *core.RelationshipIntegrity
+	RelationshipReference
 }
 
 // ToCoreTuple converts the Relationship to a core.RelationTuple.
@@ -133,8 +133,8 @@ const (
 
 // RelationshipUpdate represents an update to a relationship.
 type RelationshipUpdate struct {
-	Operation    UpdateOperation
 	Relationship Relationship
+	Operation    UpdateOperation
 }
 
 func (ru RelationshipUpdate) OperationString() string {