rename Unique to Set

NethermindEth · Jan 23, 2025 · a99ecad · a99ecad
1 parent f645352
commit a99ecad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/rpc/storage.go b/rpc/storage.go
@@ -101,8 +101,8 @@ func (h *Handler) StorageProof(id BlockID,
 	}
 
 	// Do a sanity check and remove duplicates from the keys
-	classes = utils.Unique(classes)
-	contracts = utils.Unique(contracts)
+	classes = utils.Set(classes)
+	contracts = utils.Set(contracts)
 
 	// Remove duplicates from the storage keys
 	mergedStorageKeys := make(map[felt.Felt][]felt.Felt)
@@ -116,7 +116,7 @@ func (h *Handler) StorageProof(id BlockID,
 
 	uniqueStorageKeys := make([]StorageKeys, 0, len(mergedStorageKeys))
 	for contract, keys := range mergedStorageKeys {
-		uniqueStorageKeys = append(uniqueStorageKeys, StorageKeys{Contract: contract, Keys: utils.Unique(keys)})
+		uniqueStorageKeys = append(uniqueStorageKeys, StorageKeys{Contract: contract, Keys: utils.Set(keys)})
 	}
 
 	classProof, err := getClassProof(classTrie, classes)

diff --git a/utils/slices.go b/utils/slices.go
@@ -40,12 +40,11 @@ func AnyOf[T comparable](e T, values ...T) bool {
 
 // Unique returns a new slice with duplicates removed.
 // Panics if the slice contains pointer types.
-func Unique[T comparable](slice []T) []T {
+func Set[T comparable](slice []T) []T {
 	if len(slice) == 0 {
 		return slice
 	}
 
-	// do not support unique on pointer types, just return the slice as it is
 	if reflect.TypeOf(slice[0]).Kind() == reflect.Ptr {
 		panic("Unique does not support pointer types")
 	}

diff --git a/utils/slices_test.go b/utils/slices_test.go
@@ -74,34 +74,34 @@ func TestAnyOf(t *testing.T) {
 	})
 }
 
-func TestUnique(t *testing.T) {
+func TestSet(t *testing.T) {
 	t.Run("nil slice", func(t *testing.T) {
 		var input []int
-		actual := Unique(input)
+		actual := Set(input)
 		assert.Nil(t, actual)
 	})
 
 	t.Run("empty slice", func(t *testing.T) {
 		input := []int{}
-		actual := Unique(input)
+		actual := Set(input)
 		assert.Empty(t, actual)
 	})
 
 	t.Run("slice with no duplicates", func(t *testing.T) {
 		input := []int{1, 2, 3, 4, 5}
-		actual := Unique(input)
+		actual := Set(input)
 		assert.Equal(t, []int{1, 2, 3, 4, 5}, actual)
 	})
 
 	t.Run("slice with duplicates", func(t *testing.T) {
 		input := []int{1, 2, 2, 3, 3, 3, 4, 5, 5}
-		actual := Unique(input)
+		actual := Set(input)
 		assert.Equal(t, []int{1, 2, 3, 4, 5}, actual)
 	})
 
 	t.Run("slice of strings with duplicates", func(t *testing.T) {
 		input := []string{"a", "b", "b", "c", "c", "c"}
-		actual := Unique(input)
+		actual := Set(input)
 		assert.Equal(t, []string{"a", "b", "c"}, actual)
 	})
 }