Minor fixes

NethermindEth · Sep 27, 2024 · 58e9316 · 58e9316
1 parent ed7d269
commit 58e9316
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/clients/feeder/feeder.go b/clients/feeder/feeder.go
@@ -11,6 +11,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"testing"
 	"time"
 
 	"github.com/NethermindEth/juno/core/felt"
@@ -91,7 +92,7 @@ func NopBackoff(d time.Duration) time.Duration {
 }
 
 // NewTestClient returns a client and a function to close a test server.
-func NewTestClient(t utils.BenchmarkTesting, network *utils.Network) *Client {
+func NewTestClient(t testing.TB, network *utils.Network) *Client {
 	srv := newTestServer(t, network)
 	t.Cleanup(srv.Close)
 	ua := "Juno/v0.0.1-test Starknet Implementation"
@@ -116,7 +117,7 @@ func NewTestClient(t utils.BenchmarkTesting, network *utils.Network) *Client {
 	return c
 }
 
-func newTestServer(t utils.BenchmarkTesting, network *utils.Network) *httptest.Server {
+func newTestServer(t testing.TB, network *utils.Network) *httptest.Server {
 	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		queryMap, err := url.ParseQuery(r.URL.RawQuery)
 		if err != nil {

diff --git a/core/class.go b/core/class.go
@@ -193,9 +193,9 @@ func computeHintedClassHash(abi, program json.RawMessage) (*felt.Felt, error) {
 	// Combine both ABI and Program JSON strings
 	var hintedClassHashJSON strings.Builder
 	hintedClassHashJSON.Grow(len(formattedABI) + len(formattedSpacesProgramStr))
-	hintedClassHashJSON.WriteString("{\"abi\": ")
+	hintedClassHashJSON.WriteString(`{"abi": `)
 	hintedClassHashJSON.WriteString(formattedABI)
-	hintedClassHashJSON.WriteString(", \"program\": ")
+	hintedClassHashJSON.WriteString(`, "program": `)
 	hintedClassHashJSON.WriteString(formattedSpacesProgramStr)
 	hintedClassHashJSON.WriteString("}")
 

diff --git a/core/program.go b/core/program.go
@@ -54,7 +54,7 @@ func (p *Program) Format() error {
 
 func (p *Program) ReorderHints() error {
 	// Extract keys and convert them to integers
-	intKeys := make([]int, p.Hints.Len())
+	intKeys := []int{}
 
 	for pair := p.Hints.Oldest(); pair != nil; pair = pair.Next() {
 		key := pair.Key

diff --git a/utils/test.go b/utils/test.go
@@ -8,14 +8,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-type BenchmarkTesting interface {
-	Errorf(format string, args ...interface{})
-	FailNow()
-	Logf(format string, args ...interface{})
-	Fatalf(format string, args ...interface{})
-	Cleanup(func())
-}
-
 func HexToFelt(t testing.TB, hex string) *felt.Felt {
 	t.Helper()
 	f, err := new(felt.Felt).SetString(hex)