Do less

kipz · Dec 19, 2023 · 5f6b7d5 · 5f6b7d5
1 parent 33ddd84
commit 5f6b7d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/metadata/metadata.go b/metadata/metadata.go
@@ -154,12 +154,13 @@ func MetaFile(version int64) *MetaFiles {
 
 // FromFile load metadata from file
 func (meta *Metadata[T]) FromFile(name string) (*Metadata[T], error) {
-	in, err := os.Open(name)
-	if err != nil {
-		return nil, err
-	}
-	defer in.Close()
-	data, err := io.ReadAll(in)
+	// in, err := os.Open(name)
+	// if err != nil {
+	// 	return nil, err
+	// }
+	// defer in.Close()
+	// data, err := io.ReadAll(in)
+	data, err := os.ReadFile(name)
 	if err != nil {
 		return nil, err
 	}

diff --git a/metadata/metadata_api_test.go b/metadata/metadata_api_test.go
@@ -139,31 +139,31 @@ func TestCompareFromBytesFromFileToBytes(t *testing.T) {
 	assert.NoError(t, err)
 	rootBytesActual, err := root.ToBytes(true)
 	assert.NoError(t, err)
-	assert.EqualValues(t, rootBytesWant, rootBytesActual)
+	assert.Equal(t, rootBytesWant, rootBytesActual)
 
 	targetsBytesWant, err := os.ReadFile(fmt.Sprintf("%s/targets.json", testutils.RepoDir))
 	assert.NoError(t, err)
 	targets, err := Targets().FromFile(fmt.Sprintf("%s/targets.json", testutils.RepoDir))
 	assert.NoError(t, err)
 	targetsBytesActual, err := targets.ToBytes(true)
 	assert.NoError(t, err)
-	assert.EqualValues(t, targetsBytesWant, targetsBytesActual)
+	assert.Equal(t, targetsBytesWant, targetsBytesActual)
 
 	snapshotBytesWant, err := os.ReadFile(fmt.Sprintf("%s/snapshot.json", testutils.RepoDir))
 	assert.NoError(t, err)
 	snapshot, err := Snapshot().FromFile(fmt.Sprintf("%s/snapshot.json", testutils.RepoDir))
 	assert.NoError(t, err)
 	snapshotBytesActual, err := snapshot.ToBytes(true)
 	assert.NoError(t, err)
-	assert.EqualValues(t, snapshotBytesWant, snapshotBytesActual)
+	assert.Equal(t, snapshotBytesWant, snapshotBytesActual)
 
 	timestampBytesWant, err := os.ReadFile(fmt.Sprintf("%s/timestamp.json", testutils.RepoDir))
 	assert.NoError(t, err)
 	timestamp, err := Timestamp().FromFile(fmt.Sprintf("%s/timestamp.json", testutils.RepoDir))
 	assert.NoError(t, err)
 	timestampBytesActual, err := timestamp.ToBytes(true)
 	assert.NoError(t, err)
-	assert.EqualValues(t, timestampBytesWant, timestampBytesActual)
+	assert.Equal(t, timestampBytesWant, timestampBytesActual)
 }
 
 func TestRootReadWriteReadCompare(t *testing.T) {