Changed to pointer receiver when both were mixed

- Changed to pointer receiver when both were mixed. - https://go.dev/doc/faq#methods_on_values_or_pointers Signed-off-by: naveensrinivasan <[email protected]>
in-toto · Nov 15, 2023 · c487391 · c487391
1 parent 08d1c37
commit c487391
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/attestation/material/material.go b/attestation/material/material.go
@@ -47,15 +47,15 @@ type Attestor struct {
 	materials map[string]cryptoutil.DigestSet
 }
 
-func (a Attestor) Name() string {
+func (a *Attestor) Name() string {
 	return Name
 }
 
-func (a Attestor) Type() string {
+func (a *Attestor) Type() string {
 	return Type
 }
 
-func (rc *Attestor) RunType() attestation.RunType {
+func (a *Attestor) RunType() attestation.RunType {
 	return RunType
 }
 

diff --git a/attestation/product/product.go b/attestation/product/product.go
@@ -125,15 +125,15 @@ func fromDigestMap(digestMap map[string]cryptoutil.DigestSet) map[string]attesta
 	return products
 }
 
-func (a Attestor) Name() string {
+func (a *Attestor) Name() string {
 	return Name
 }
 
-func (a Attestor) Type() string {
+func (a *Attestor) Type() string {
 	return Type
 }
 
-func (rc *Attestor) RunType() attestation.RunType {
+func (a *Attestor) RunType() attestation.RunType {
 	return RunType
 }
 

diff --git a/cryptoutil/digestset.go b/cryptoutil/digestset.go
@@ -114,9 +114,9 @@ func (first DigestSet) Equal(second DigestSet) bool {
 	return hasMatchingDigest
 }
 
-func (ds DigestSet) ToNameMap() (map[string]string, error) {
+func (first DigestSet) ToNameMap() (map[string]string, error) {
 	nameMap := make(map[string]string)
-	for hash, digest := range ds {
+	for hash, digest := range first {
 		name, ok := hashNames[hash]
 		if !ok {
 			return nameMap, ErrUnsupportedHash(hash.String())
@@ -190,16 +190,16 @@ func CalculateDigestSetFromFile(path string, hashes []crypto.Hash) (DigestSet, e
 	return CalculateDigestSet(file, hashes)
 }
 
-func (ds DigestSet) MarshalJSON() ([]byte, error) {
-	nameMap, err := ds.ToNameMap()
+func (first DigestSet) MarshalJSON() ([]byte, error) {
+	nameMap, err := first.ToNameMap()
 	if err != nil {
 		return nil, err
 	}
 
 	return json.Marshal(nameMap)
 }
 
-func (ds *DigestSet) UnmarshalJSON(data []byte) error {
+func (first *DigestSet) UnmarshalJSON(data []byte) error {
 	nameMap := make(map[string]string)
 	err := json.Unmarshal(data, &nameMap)
 	if err != nil {
@@ -211,7 +211,7 @@ func (ds *DigestSet) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	*ds = newDs
+	*first = newDs
 	return nil
 }
 

diff --git a/registry/option.go b/registry/option.go
@@ -37,7 +37,7 @@ type ConfigOption[T any, TOption Option] struct {
 	setter      func(T, TOption) (T, error)
 }
 
-func (co ConfigOption[T, TOption]) Name() string {
+func (co *ConfigOption[T, TOption]) Name() string {
 	if len(co.prefix) == 0 {
 		return co.name
 	}
@@ -49,15 +49,15 @@ func (co *ConfigOption[T, TOption]) SetPrefix(prefix string) {
 	co.prefix = prefix
 }
 
-func (co ConfigOption[T, TOption]) DefaultVal() TOption {
+func (co *ConfigOption[T, TOption]) DefaultVal() TOption {
 	return co.defaultVal
 }
 
-func (co ConfigOption[T, TOption]) Description() string {
+func (co *ConfigOption[T, TOption]) Description() string {
 	return co.description
 }
 
-func (co ConfigOption[T, TOption]) Setter() func(T, TOption) (T, error) {
+func (co *ConfigOption[T, TOption]) Setter() func(T, TOption) (T, error) {
 	return co.setter
 }