fix: refactor String utils

dollarsignteam · Jan 15, 2024 · f8f5f80 · f8f5f80
1 parent 01c95da
commit f8f5f80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/string.go b/string.go
@@ -122,8 +122,8 @@ func (StringUtil) HashCrc32(s string) string {
 }
 
 // Parse EMVCoQR string to struct
-func (StringUtil) ParseEMVCoQRString(qrString string) (EMVCoQRInfo, error) {
-	if err := ValidateEMVCoQRString(qrString); err != nil {
+func (s StringUtil) ParseEMVCoQRString(qrString string) (EMVCoQRInfo, error) {
+	if err := s.ValidateEMVCoQRString(qrString); err != nil {
 		return EMVCoQRInfo{}, err
 	}
 	result := EMVCoQRInfo{}
@@ -195,7 +195,7 @@ func (StringUtil) ParseEMVCoQRString(qrString string) (EMVCoQRInfo, error) {
 }
 
 // ValidateEMVCoQRString validates the EMVCoQR string
-func ValidateEMVCoQRString(qrString string) error {
+func (StringUtil) ValidateEMVCoQRString(qrString string) error {
 	if len(qrString) < 14 {
 		return fmt.Errorf("invalid specified qr string length")
 	}
@@ -210,7 +210,7 @@ func ValidateEMVCoQRString(qrString string) error {
 }
 
 // Encrypt encrypts the given plaintext using AES encryption with the provided key.
-func AESEncrypt(key, plaintext string) (string, error) {
+func (StringUtil) AESEncrypt(key, plaintext string) (string, error) {
 	block, err := aes.NewCipher([]byte(key))
 	if err != nil {
 		return "", err
@@ -228,7 +228,7 @@ func AESEncrypt(key, plaintext string) (string, error) {
 }
 
 // Decrypt decrypts the given cipherText using AES decryption with the provided key.
-func AESDecrypt(key, cipherText string) (string, error) {
+func (StringUtil) AESDecrypt(key, cipherText string) (string, error) {
 	block, err := aes.NewCipher([]byte(key))
 	if err != nil {
 		return "", err

diff --git a/string_test.go b/string_test.go
@@ -161,9 +161,9 @@ func TestAESEncryptDecrypt(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			cipherText, err := utils.AESEncrypt(test.key, test.plaintext)
+			cipherText, err := utils.String.AESEncrypt(test.key, test.plaintext)
 			assert.NoError(t, err)
-			decryptedText, err := utils.AESDecrypt(test.key, cipherText)
+			decryptedText, err := utils.String.AESDecrypt(test.key, cipherText)
 			assert.NoError(t, err)
 			assert.Equal(t, test.expected, decryptedText)
 		})