refactor: adding split back and use string literals

axone-protocol · Oct 28, 2024 · d0830d1 · d0830d1
1 parent dd0a369
commit d0830d1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/x/logic/predicate/bank_test.go b/x/logic/predicate/bank_test.go
@@ -4,6 +4,7 @@ package predicate
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/axone-protocol/prolog/engine"
@@ -35,6 +36,7 @@ import (
 )
 
 func TestBank(t *testing.T) {
+	bench32DecodingFail := strings.Join(strings.Split("decoding bech32 failed: invalid bech32 string length 3", ""), ",")
 	Convey("Under a mocked environment", t, func() {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
@@ -172,7 +174,7 @@ func TestBank(t *testing.T) {
 				balances:   []bank.Balance{},
 				query:      `bank_balances('foo', X).`,
 				wantResult: []testutil.TermResults{{"X": "[uaxone-100]"}},
-				wantError:  fmt.Errorf("error(domain_error(encoding(bech32),foo),[decoding bech32 failed: invalid bech32 string length 3],bank_balances/2)"),
+				wantError:  fmt.Errorf("error(domain_error(encoding(bech32),foo),[%s],bank_balances/2)", bench32DecodingFail),
 			},
 			{
 				ctx:        context.Background(),
@@ -306,7 +308,7 @@ func TestBank(t *testing.T) {
 				spendableCoins: []bank.Balance{},
 				query:          `bank_spendable_balances('foo', X).`,
 				wantResult:     []testutil.TermResults{{"X": "[uaxone-100]"}},
-				wantError:      fmt.Errorf("error(domain_error(encoding(bech32),foo),[decoding bech32 failed: invalid bech32 string length 3],bank_spendable_balances/2)"),
+				wantError:      fmt.Errorf("error(domain_error(encoding(bech32),foo),[%s],bank_spendable_balances/2)", bench32DecodingFail),
 			},
 
 			{
@@ -450,7 +452,7 @@ func TestBank(t *testing.T) {
 				lockedCoins: []bank.Balance{},
 				query:       `bank_locked_balances('foo', X).`,
 				wantResult:  []testutil.TermResults{{"X": "[uaxone-100]"}},
-				wantError:   fmt.Errorf("error(domain_error(encoding(bech32),foo),[decoding bech32 failed: invalid bech32 string length 3],bank_locked_balances/2)"),
+				wantError:   fmt.Errorf("error(domain_error(encoding(bech32),foo),[%s],bank_locked_balances/2)", bench32DecodingFail),
 			},
 		}
 		for nc, tc := range cases {

diff --git a/x/logic/predicate/crypto_test.go b/x/logic/predicate/crypto_test.go
@@ -3,6 +3,7 @@ package predicate
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/axone-protocol/prolog/engine"
@@ -158,6 +159,9 @@ func TestCryptoOperations(t *testing.T) {
 }
 
 func TestXVerify(t *testing.T) {
+	badPublicKeyLength := strings.Join(strings.Split("ed25519: bad public key length: 33", ""), ",")
+	failedToParsePublicKey := strings.Join(strings.Split("failed to parse compressed public key (first 10 bytes): 0213c8426be471e55506", ""), ",")
+
 	Convey("Given a test cases", t, func() {
 		cases := []struct {
 			program     string
@@ -203,7 +207,7 @@ func TestXVerify(t *testing.T) {
 				eddsa_verify(PubKey, Msg, Sig, encoding(octet)).`,
 				query:       `verify.`,
 				wantSuccess: false,
-				wantError:   fmt.Errorf("error(syntax_error([ed25519: bad public key length: 33]),eddsa_verify/4)"),
+				wantError:   fmt.Errorf("error(syntax_error([%s]),eddsa_verify/4)", badPublicKeyLength),
 			},
 			{ // Wrong signature
 				program: `verify :-
@@ -254,7 +258,7 @@ func TestXVerify(t *testing.T) {
 				ecdsa_verify(PubKey, Msg, Sig, encoding(octet)).`,
 				query:       `verify.`,
 				wantSuccess: false,
-				wantError:   fmt.Errorf("error(syntax_error([failed to parse compressed public key (first 10 bytes): 0213c8426be471e55506]),ecdsa_verify/4)"),
+				wantError:   fmt.Errorf("error(syntax_error([%s]),ecdsa_verify/4)", failedToParsePublicKey),
 			},
 			{ // Unsupported algo
 				program: `verify :-

diff --git a/x/logic/predicate/did_test.go b/x/logic/predicate/did_test.go
@@ -3,6 +3,7 @@ package predicate
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/axone-protocol/prolog/engine"
@@ -22,6 +23,7 @@ import (
 )
 
 func TestDID(t *testing.T) {
+	invalidDID := strings.Join(strings.Split("invalid DID", ""), ",")
 	Convey("Given a test cases", t, func() {
 		cases := []struct {
 			program    string
@@ -78,7 +80,7 @@ func TestDID(t *testing.T) {
 			{
 				query:      `did_components('foo',X).`,
 				wantResult: []testutil.TermResults{},
-				wantError:  fmt.Errorf("error(domain_error(encoding(did),foo),[invalid DID],did_components/2)"),
+				wantError:  fmt.Errorf("error(domain_error(encoding(did),foo),[%s],did_components/2)", invalidDID),
 			},
 			{
 				query:      `did_components(123,X).`,

diff --git a/x/logic/predicate/encoding_test.go b/x/logic/predicate/encoding_test.go
@@ -2,6 +2,7 @@ package predicate
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/axone-protocol/prolog"
@@ -22,6 +23,8 @@ import (
 )
 
 func TestHexBytesPredicate(t *testing.T) {
+	hexEncodingErrorFmt := strings.Join(strings.Split("encoding/hex: invalid byte: U+0069 'i'", ""), ",")
+
 	Convey("Given a test cases", t, func() {
 		cases := []struct {
 			program     string
@@ -57,7 +60,7 @@ func TestHexBytesPredicate(t *testing.T) {
 			{
 				query: `hex_bytes('fail',
 				[44,38,180,107,104,255,198,143,249,155,69,60,29,48,65,52,19,66,45,112,100,131,191,160,249,138,94,136,98,102,231,174]).`,
-				wantError:   fmt.Errorf("error(domain_error(encoding(hex),fail),[encoding/hex: invalid byte: U+0069 'i'],hex_bytes/2)"),
+				wantError:   fmt.Errorf("error(domain_error(encoding(hex),fail),[%s],hex_bytes/2)", hexEncodingErrorFmt),
 				wantSuccess: false,
 			},
 			{

diff --git a/x/logic/predicate/uri_test.go b/x/logic/predicate/uri_test.go
@@ -3,6 +3,7 @@ package predicate
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/axone-protocol/prolog/engine"
@@ -22,6 +23,7 @@ import (
 )
 
 func TestURIEncoded(t *testing.T) {
+	invalidUrlEscape := strings.Join(strings.Split("invalid URL escape \"%%3\"", ""), ",")
 	Convey("Given a test cases", t, func() {
 		cases := []struct {
 			program     string
@@ -166,7 +168,7 @@ func TestURIEncoded(t *testing.T) {
 			{
 				query:       "uri_encoded(path, Decoded, 'bar%%3foo').",
 				wantSuccess: false,
-				wantError:   fmt.Errorf("error(domain_error(encoding(uri),bar%%%%3foo),[invalid URL escape \"%%3\"],uri_encoded/3)"),
+				wantError:   fmt.Errorf("error(domain_error(encoding(uri),bar%%%%3foo),[%s],uri_encoded/3)", invalidUrlEscape),
 			},
 		}
 		for nc, tc := range cases {