Fix after merge conflicts.

eigerco · Nov 19, 2024 · 89675cc · 89675cc
1 parent 1e1e486
commit 89675cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/internal/state/merkle/helpers_test.go b/internal/state/merkle/helpers_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/eigerco/strawberry/internal/service"
 	"github.com/eigerco/strawberry/internal/testutils"
 	"github.com/eigerco/strawberry/internal/validator"
-	"github.com/eigerco/strawberry/pkg/serialization"
 	"github.com/eigerco/strawberry/pkg/serialization/codec/jam"
 	"github.com/stretchr/testify/require"
 )
@@ -36,15 +35,15 @@ func RandomValidatorsData(t *testing.T) safrole.ValidatorsData {
 func RandomTickets(t *testing.T) []block.Ticket {
 	var tickets []block.Ticket
 	for i := 0; i < 10; i++ {
-		tickets = append(tickets, block.Ticket{Identifier: testutils.RandomHash(t)})
+		tickets = append(tickets, block.Ticket{Identifier: testutils.RandomBandersnatchOutputHash(t)})
 	}
 	return tickets
 }
 
 func RandomTicketBodies(t *testing.T) safrole.TicketsBodies {
 	var tickets safrole.TicketsBodies
 	for i := 0; i < 10; i++ {
-		tickets[i] = block.Ticket{Identifier: testutils.RandomHash(t)}
+		tickets[i] = block.Ticket{Identifier: testutils.RandomBandersnatchOutputHash(t)}
 	}
 	return tickets
 }
@@ -424,7 +423,7 @@ func deserializeServices(state *state.State, serializedState map[crypto.Hash][]b
 				FootprintSize          uint64
 				FootprintItems         int
 			}
-			if err := serializer.Decode(encodedValue, &combined); err != nil {
+			if err := jam.Unmarshal(encodedValue, &combined); err != nil {
 				return err
 			}
 

diff --git a/internal/state/merkle/serialization.go b/internal/state/merkle/serialization.go
@@ -5,7 +5,6 @@ import (
 	"github.com/eigerco/strawberry/internal/crypto"
 	"github.com/eigerco/strawberry/internal/service"
 	"github.com/eigerco/strawberry/internal/state"
-	"github.com/eigerco/strawberry/pkg/serialization"
 	"github.com/eigerco/strawberry/pkg/serialization/codec/jam"
 )