Add jam marshal to state transition

eigerco · Nov 19, 2024 · 07b0c73 · 07b0c73
1 parent 5680cfc
commit 07b0c73
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/internal/block/guarantee.go b/internal/block/guarantee.go
@@ -1,7 +1,6 @@
 package block
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/eigerco/strawberry/internal/crypto"
@@ -163,7 +162,7 @@ func (w *WorkReport) Hash() (crypto.Hash, error) {
 	if w == nil {
 		return crypto.Hash{}, nil
 	}
-	jsonData, err := json.Marshal(w)
+	jsonData, err := jam.Marshal(w)
 	if err != nil {
 		return crypto.Hash{}, err
 	}

diff --git a/internal/statetransition/state_transition.go b/internal/statetransition/state_transition.go
@@ -3,7 +3,6 @@ package statetransition
 import (
 	"bytes"
 	"crypto/ed25519"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"log"
@@ -318,7 +317,7 @@ func calculateNewRecentBlocks(header block.Header, guarantees block.GuaranteesEx
 	workPackageMapping := buildWorkPackageMapping(guarantees.Guarantees)
 
 	// Equation 83: let n = {p, h ▸▸ H(H), b, s ▸▸ H_0}
-	headerBytes, err := json.Marshal(header)
+	headerBytes, err := jam.Marshal(header)
 	if err != nil {
 		return nil, err
 	}
@@ -729,7 +728,7 @@ func verifyGuaranteeCredentials(
 			return false
 		}
 
-		reportBytes, err := json.Marshal(guarantee.WorkReport)
+		reportBytes, err := jam.Marshal(guarantee.WorkReport)
 		if err != nil {
 			return false
 		}

diff --git a/internal/statetransition/state_transition_test.go b/internal/statetransition/state_transition_test.go
@@ -2,10 +2,11 @@ package statetransition
 
 import (
 	"crypto/ed25519"
-	"encoding/json"
-	"github.com/eigerco/strawberry/internal/safrole"
 	"testing"
 
+	"github.com/eigerco/strawberry/internal/safrole"
+	"github.com/eigerco/strawberry/pkg/serialization/codec/jam"
+
 	"github.com/eigerco/strawberry/internal/block"
 	"github.com/eigerco/strawberry/internal/common"
 	"github.com/eigerco/strawberry/internal/crypto"
@@ -601,7 +602,7 @@ func TestCalculateNewCoreAssignments(t *testing.T) {
 		}
 
 		// Marshal and hash the work report for signing
-		reportBytes, err := json.Marshal(workReport)
+		reportBytes, err := jam.Marshal(workReport)
 		require.NoError(t, err)
 		reportHash := crypto.HashData(reportBytes)
 		message := append([]byte(signatureContextGuarantee), reportHash[:]...)
@@ -670,7 +671,7 @@ func TestCalculateNewCoreAssignments(t *testing.T) {
 			CoreIndex: 0,
 		}
 
-		reportBytes, err := json.Marshal(workReport)
+		reportBytes, err := jam.Marshal(workReport)
 		require.NoError(t, err)
 		reportHash := crypto.HashData(reportBytes)
 		message := append([]byte(signatureContextGuarantee), reportHash[:]...)
@@ -736,7 +737,7 @@ func TestCalculateNewCoreAssignments(t *testing.T) {
 			CoreIndex: 0,
 		}
 
-		reportBytes, err := json.Marshal(workReport)
+		reportBytes, err := jam.Marshal(workReport)
 		require.NoError(t, err)
 		reportHash := crypto.HashData(reportBytes)
 		message := append([]byte(signatureContextGuarantee), reportHash[:]...)
@@ -804,7 +805,7 @@ func TestCalculateNewCoreAssignments(t *testing.T) {
 			CoreIndex: 0,
 		}
 
-		reportBytes, err := json.Marshal(workReport)
+		reportBytes, err := jam.Marshal(workReport)
 		require.NoError(t, err)
 		reportHash := crypto.HashData(reportBytes)
 		message := append([]byte(signatureContextGuarantee), reportHash[:]...)