change require.Equal to assert.JSONEq

terra-money · Jul 8, 2021 · 04fe3cd · 04fe3cd
1 parent 950f992
commit 04fe3cd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 44 deletions.
diff --git a/x/market/legacy/v05/migrate_test.go b/x/market/legacy/v05/migrate_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -59,5 +60,5 @@ func TestMigrate(t *testing.T) {
 	}
 }`
 
-	require.Equal(t, expected, string(indentedBz))
+	assert.JSONEq(t, expected, string(indentedBz))
 }
diff --git a/x/oracle/legacy/v05/migrate_test.go b/x/oracle/legacy/v05/migrate_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -236,25 +237,5 @@ func TestMigrate(t *testing.T) {
 	]
 }`
 
-	areEqualJSON(t, expected, string(indentedBz))
-}
-
-func areEqualJSON(t *testing.T, s1, s2 string) {
-	var o1 interface{}
-	var o2 interface{}
-
-	var err error
-	err = json.Unmarshal([]byte(s1), &o1)
-	require.NoError(t, err)
-
-	err = json.Unmarshal([]byte(s2), &o2)
-	require.NoError(t, err)
-
-	bz1, err := json.Marshal(o1)
-	require.NoError(t, err)
-
-	bz2, err := json.Marshal(o2)
-	require.NoError(t, err)
-
-	require.Equal(t, bz1, bz2)
+	assert.JSONEq(t, expected, string(indentedBz))
 }
diff --git a/x/treasury/legacy/v05/migrate_test.go b/x/treasury/legacy/v05/migrate_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -181,25 +182,5 @@ func TestMigrate(t *testing.T) {
 	"tax_rate": "0.020000000000000000"
 }`
 
-	areEqualJSON(t, expected, string(indentedBz))
-}
-
-func areEqualJSON(t *testing.T, s1, s2 string) {
-	var o1 interface{}
-	var o2 interface{}
-
-	var err error
-	err = json.Unmarshal([]byte(s1), &o1)
-	require.NoError(t, err)
-
-	err = json.Unmarshal([]byte(s2), &o2)
-	require.NoError(t, err)
-
-	bz1, err := json.Marshal(o1)
-	require.NoError(t, err)
-
-	bz2, err := json.Marshal(o2)
-	require.NoError(t, err)
-
-	require.Equal(t, bz1, bz2)
+	assert.JSONEq(t, expected, string(indentedBz))
 }
diff --git a/x/wasm/legacy/v05/migrate_test.go b/x/wasm/legacy/v05/migrate_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -195,5 +196,5 @@ func TestMigrate(t *testing.T) {
 		"max_contract_size": "614400"
 	}
 }`
-	require.Equal(t, expected, string(indentedBz))
+	assert.JSONEq(t, expected, string(indentedBz))
 }