Change naming convention of checksum struct

- Change the name of Checksum struct so that it can be used by all spdx versions
- Remove unnecessary commented code

Signed-off-by: specter25 <ujjwalcoding012@gmail.com>

3 files changed, 15 insertions, 20 deletions

diff --git a/spdx/checksum.go b/spdx/checksum.go
index b689ff8..872aee2 100644
--- a/spdx/checksum.go
+++ b/spdx/checksum.go
@@ -3,24 +3,24 @@
 package spdx
 
 // ChecksumAlgorithm2_2 represents the algorithm used to generate the file checksum in the Checksum2_2 struct.
-type ChecksumAlgorithm2_2 string
+type ChecksumAlgorithm string
 
 // The checksum algorithms mentioned in the spdxv2.2.0 https://spdx.github.io/spdx-spec/4-file-information/#44-file-checksum
 const (
-	SHA224 ChecksumAlgorithm2_2 = "SHA224"
-	SHA1                        = "SHA1"
-	SHA256                      = "SHA256"
-	SHA384                      = "SHA384"
-	SHA512                      = "SHA512"
-	MD2                         = "MD2"
-	MD4                         = "MD4"
-	MD5                         = "MD5"
-	MD6                         = "MD6"
+	SHA224 ChecksumAlgorithm = "SHA224"
+	SHA1                     = "SHA1"
+	SHA256                   = "SHA256"
+	SHA384                   = "SHA384"
+	SHA512                   = "SHA512"
+	MD2                      = "MD2"
+	MD4                      = "MD4"
+	MD5                      = "MD5"
+	MD6                      = "MD6"
 )
 
 //Checksum2_2 struct Provide a unique identifier to match analysis information on each specific file in a package.
 // The Algorithm field describes the ChecksumAlgorithm2_2 used and the Value represents the file checksum
-type Checksum2_2 struct {
-	Algorithm ChecksumAlgorithm2_2
+type Checksum struct {
+	Algorithm ChecksumAlgorithm
 	Value     string
 }
diff --git a/spdx/file.go b/spdx/file.go
index bb3bcdd..1ec3202 100644
--- a/spdx/file.go
+++ b/spdx/file.go
@@ -105,11 +105,8 @@ type File2_2 struct {
 
 	// 4.4: File Checksum: may have keys for SHA1, SHA256 and/or MD5
 	// Cardinality: mandatory, one SHA1, others may be optionally provided
-	// FileChecksumSHA1   string
-	// FileChecksumSHA256 string
-	// FileChecksumMD5    string
 
-	FileChecksums map[ChecksumAlgorithm2_2]Checksum2_2
+	FileChecksums map[ChecksumAlgorithm]Checksum
 
 	// 4.5: Concluded License: SPDX License Expression, "NONE" or "NOASSERTION"
 	// Cardinality: mandatory, one
diff --git a/spdx/package.go b/spdx/package.go
index 9ad9317..953c9db 100644
--- a/spdx/package.go
+++ b/spdx/package.go
@@ -192,10 +192,8 @@ type Package2_2 struct {
 
 	// 3.10: Package Checksum: may have keys for SHA1, SHA256 and/or MD5
 	// Cardinality: optional, one or many
-	// PackageChecksumSHA1   string
-	// PackageChecksumSHA256 string
-	// PackageChecksumMD5    string
-	PackageChecksums map[ChecksumAlgorithm2_2]Checksum2_2
+
+	PackageChecksums map[ChecksumAlgorithm]Checksum
 
 	// 3.11: Package Home Page
 	// Cardinality: optional, one