X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f4ca9ad94a6bb006d1f3c7ba207837f1736d1247..f9e3d32c92920a806d50548dbb9b6c0aab7d8c54:/services/datamanager/summary/trash_list_test.go

diff --git a/services/datamanager/summary/trash_list_test.go b/services/datamanager/summary/trash_list_test.go
index 555211fe02..3626904f33 100644
--- a/services/datamanager/summary/trash_list_test.go
+++ b/services/datamanager/summary/trash_list_test.go
@@ -26,12 +26,12 @@ func (s *TrashSuite) TestBuildTrashLists(c *C) {
 	var keepServerInfo = keep.ReadServers{
 		KeepServerIndexToAddress: []keep.ServerAddress{sv0, sv1},
 		BlockToServers: map[blockdigest.DigestWithSize][]keep.BlockServerInfo{
-			block0: []keep.BlockServerInfo{
-				keep.BlockServerInfo{0, 99},
-				keep.BlockServerInfo{1, 101}},
-			block1: []keep.BlockServerInfo{
-				keep.BlockServerInfo{0, 99},
-				keep.BlockServerInfo{1, 101}}}}
+			block0: {
+				{0, 99},
+				{1, 101}},
+			block1: {
+				{0, 99},
+				{1, 101}}}}
 
 	// only block0 is in delete set
 	var bs = make(BlockSet)
@@ -40,37 +40,37 @@ func (s *TrashSuite) TestBuildTrashLists(c *C) {
 	// Test trash list where only sv0 is on writable list.
 	c.Check(buildTrashListsInternal(
 		map[string]struct{}{
-			sv0.URL(): struct{}{}},
+			sv0.URL(): {}},
 		&keepServerInfo,
 		110,
 		bs),
 		DeepEquals,
 		map[string]keep.TrashList{
-			"http://keep0.example.com:80": keep.TrashList{keep.TrashRequest{"000000000000000000000000deadbeef", 99}}})
+			"http://keep0.example.com:80": {keep.TrashRequest{"000000000000000000000000deadbeef", 99}}})
 
 	// Test trash list where both sv0 and sv1 are on writable list.
 	c.Check(buildTrashListsInternal(
 		map[string]struct{}{
-			sv0.URL(): struct{}{},
-			sv1.URL(): struct{}{}},
+			sv0.URL(): {},
+			sv1.URL(): {}},
 		&keepServerInfo,
 		110,
 		bs),
 		DeepEquals,
 		map[string]keep.TrashList{
-			"http://keep0.example.com:80": keep.TrashList{keep.TrashRequest{"000000000000000000000000deadbeef", 99}},
-			"http://keep1.example.com:80": keep.TrashList{keep.TrashRequest{"000000000000000000000000deadbeef", 101}}})
+			"http://keep0.example.com:80": {keep.TrashRequest{"000000000000000000000000deadbeef", 99}},
+			"http://keep1.example.com:80": {keep.TrashRequest{"000000000000000000000000deadbeef", 101}}})
 
 	// Test trash list where only block on sv0 is expired
 	c.Check(buildTrashListsInternal(
 		map[string]struct{}{
-			sv0.URL(): struct{}{},
-			sv1.URL(): struct{}{}},
+			sv0.URL(): {},
+			sv1.URL(): {}},
 		&keepServerInfo,
 		100,
 		bs),
 		DeepEquals,
 		map[string]keep.TrashList{
-			"http://keep0.example.com:80": keep.TrashList{keep.TrashRequest{"000000000000000000000000deadbeef", 99}}})
+			"http://keep0.example.com:80": {keep.TrashRequest{"000000000000000000000000deadbeef", 99}}})
 
 }