From 36b185e408a56d93678f52a59e1d68ece8bf0508 Mon Sep 17 00:00:00 2001
From: "Joe Richey joerichey@google.com" <joerichey@google.com>
Date: Thu, 30 Aug 2018 03:54:08 -0700
Subject: [PATCH] Use proto.Equal instead of reflect.DeepEquals

---
 actions/policy.go             | 4 ++--
 filesystem/filesystem_test.go | 8 ++++----
 metadata/config_test.go       | 5 +++--
 metadata/policy_test.go       | 5 +++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/actions/policy.go b/actions/policy.go
index cbdcb3a..39c235d 100644
--- a/actions/policy.go
+++ b/actions/policy.go
@@ -22,8 +22,8 @@ package actions
 import (
 	"fmt"
 	"log"
-	"reflect"
 
+	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 
 	"github.com/google/fscrypt/crypto"
@@ -153,7 +153,7 @@ func GetPolicyFromPath(ctx *Context, path string) (*Policy, error) {
 	}
 	log.Printf("found data for policy %s on %q", descriptor, ctx.Mount.Path)
 
-	if !reflect.DeepEqual(pathData.Options, mountData.Options) {
+	if !proto.Equal(pathData.Options, mountData.Options) {
 		log.Printf("options from path: %+v", pathData.Options)
 		log.Printf("options from mount: %+v", mountData.Options)
 		return nil, errors.Wrapf(ErrPolicyMetadataMismatch, "policy %s", descriptor)
diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go
index 04d5123..2394f68 100644
--- a/filesystem/filesystem_test.go
+++ b/filesystem/filesystem_test.go
@@ -22,9 +22,9 @@ package filesystem
 import (
 	"os"
 	"path/filepath"
-	"reflect"
 	"testing"
 
+	"github.com/golang/protobuf/proto"
 	"github.com/pkg/errors"
 
 	"github.com/google/fscrypt/crypto"
@@ -205,7 +205,7 @@ func TestSetPolicy(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if !reflect.DeepEqual(realPolicy, policy) {
+	if !proto.Equal(realPolicy, policy) {
 		t.Errorf("policy %+v does not equal expected policy %+v", realPolicy, policy)
 	}
 
@@ -229,7 +229,7 @@ func TestSetProtector(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if !reflect.DeepEqual(realProtector, protector) {
+	if !proto.Equal(realProtector, protector) {
 		t.Errorf("protector %+v does not equal expected protector %+v", realProtector, protector)
 	}
 }
@@ -289,7 +289,7 @@ func TestLinkedProtector(t *testing.T) {
 		t.Error("mount returned was incorrect")
 	}
 
-	if !reflect.DeepEqual(retProtector, protector) {
+	if !proto.Equal(retProtector, protector) {
 		t.Errorf("protector %+v does not equal expected protector %+v", retProtector, protector)
 	}
 }
diff --git a/metadata/config_test.go b/metadata/config_test.go
index 95afa04..d184a87 100644
--- a/metadata/config_test.go
+++ b/metadata/config_test.go
@@ -21,8 +21,9 @@ package metadata
 
 import (
 	"bytes"
-	"reflect"
 	"testing"
+
+	"github.com/golang/protobuf/proto"
 )
 
 var testConfig = &Config{
@@ -72,7 +73,7 @@ func TestRead(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Logf("decoded config:\n%s", cfg)
-	if !reflect.DeepEqual(cfg, testConfig) {
+	if !proto.Equal(cfg, testConfig) {
 		t.Errorf("did not match: %s", testConfig)
 	}
 }
diff --git a/metadata/policy_test.go b/metadata/policy_test.go
index 783a784..ad9dd80 100644
--- a/metadata/policy_test.go
+++ b/metadata/policy_test.go
@@ -23,9 +23,10 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"reflect"
 	"testing"
 
+	"github.com/golang/protobuf/proto"
+
 	"github.com/google/fscrypt/util"
 )
 
@@ -147,7 +148,7 @@ func TestGetPolicyEmptyDirectory(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if !reflect.DeepEqual(actualPolicy, goodPolicy) {
+	if !proto.Equal(actualPolicy, goodPolicy) {
 		t.Errorf("policy %+v does not equal expected policy %+v", actualPolicy, goodPolicy)
 	}
 }
-- 
2.39.5