Merge pull request #1339 from mesg-foundation/fix/hash-unmarshal

Fix hash.Unmarshal when using proto.Unmarshal

database/process_db_test.go

@@ -63,3 +63,35 @@ func TestProcessDB(t *testing.T) {
 		require.NoError(t, db.Delete(p.Hash))
 	})
 }
+
+func TestHashIsDifferent(t *testing.T) {
+	dir, _ := ioutil.TempDir("", "process.db.test")
+	defer os.Remove(dir)
+
+	db, err := NewProcessDB(dir)
+	require.NoError(t, err)
+	defer db.Close()
+
+	p1 := &process.Process{
+		Hash: hash.Int(1),
+		Key:  "1",
+	}
+
+	p2 := &process.Process{
+		Hash: hash.Int(2),
+		Key:  "2",
+	}
+
+	db.Save(p1)
+	db.Save(p2)
+
+	list, err := db.All()
+	require.NoError(t, err)
+	require.Len(t, list, 2)
+
+	require.Equal(t, list[0].Key, p1.Key)
+	require.Equal(t, list[0].Hash, p1.Hash)
+
+	require.Equal(t, list[1].Key, p2.Key)
+	require.Equal(t, list[1].Hash, p2.Hash)
+}

hash/hash.go

@@ -115,7 +115,8 @@ func (h Hash) MarshalTo(data []byte) (int, error) {
 
 // Unmarshal unmarshals slice of bytes into hash. It's used by protobuf.
 func (h *Hash) Unmarshal(data []byte) error {
-	*h = data
+	*h = make([]byte, len(data))
+	copy(*h, data)
 	return nil
 }
 

hash/hash_test.go

@@ -92,3 +92,12 @@ func TestUnmarshalJSON(t *testing.T) {
 	assert.NoError(t, json.Unmarshal([]byte("\"4uQeVj5tqViQh7yWWGStvkEG1Zmhx6uasJtWCJziofM\""), &h))
 	assert.Equal(t, Int(1), h)
 }
+
+func TestUnmarshal(t *testing.T) {
+	var hash Hash
+	data := []byte(Int(1))
+	hash.Unmarshal(data)
+	// check if unmarshal copy the data
+	// test if two slises do not share the same address
+	assert.True(t, &hash[cap(hash)-1] != &data[cap(data)-1])
+}