From d86d56c8cf7e901b7d63e844b8cf65aa8d5047a4 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Wed, 11 Mar 2026 12:43:21 +0100
Subject: [PATCH] review feedback

---
 cmd/fetchpayload/main.go   | 20 ++------------------
 core/stateless/encoding.go |  6 +++---
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/cmd/fetchpayload/main.go b/cmd/fetchpayload/main.go
index 178a0f839b..eafc05fbe8 100644
--- a/cmd/fetchpayload/main.go
+++ b/cmd/fetchpayload/main.go
@@ -90,7 +90,8 @@ func main() {
 		fatal("failed to fetch execution witness: %v", err)
 	}
 
-	witness, err := fromExtWitness(&extWitness)
+	witness := new(stateless.Witness)
+	err = witness.FromExtWitness(&extWitness)
 	if err != nil {
 		fatal("failed to convert witness: %v", err)
 	}
@@ -154,23 +155,6 @@ func parseBlockNumber(s string) (*big.Int, error) {
 	return n, nil
 }
 
-// fromExtWitness converts the consensus ExtWitness into the internal Witness.
-// Duplicated from core/stateless (unexported method) and cmd/keeper/getpayload_example.go.
-func fromExtWitness(ext *stateless.ExtWitness) (*stateless.Witness, error) {
-	w := &stateless.Witness{}
-	w.Headers = ext.Headers
-
-	w.Codes = make(map[string]struct{}, len(ext.Codes))
-	for _, code := range ext.Codes {
-		w.Codes[string(code)] = struct{}{}
-	}
-	w.State = make(map[string]struct{}, len(ext.State))
-	for _, node := range ext.State {
-		w.State[string(node)] = struct{}{}
-	}
-	return w, nil
-}
-
 // jsonPayload is a JSON-friendly representation of Payload. It uses ExtWitness
 // instead of the internal Witness (which has no JSON marshaling).
 type jsonPayload struct {
diff --git a/core/stateless/encoding.go b/core/stateless/encoding.go
index 5c43159e66..d559178892 100644
--- a/core/stateless/encoding.go
+++ b/core/stateless/encoding.go
@@ -40,8 +40,8 @@ func (w *Witness) ToExtWitness() *ExtWitness {
 	return ext
 }
 
-// fromExtWitness converts the consensus witness format into our internal one.
-func (w *Witness) fromExtWitness(ext *ExtWitness) error {
+// FromExtWitness converts the consensus witness format into our internal one.
+func (w *Witness) FromExtWitness(ext *ExtWitness) error {
 	w.Headers = ext.Headers
 
 	w.Codes = make(map[string]struct{}, len(ext.Codes))
@@ -66,7 +66,7 @@ func (w *Witness) DecodeRLP(s *rlp.Stream) error {
 	if err := s.Decode(&ext); err != nil {
 		return err
 	}
-	return w.fromExtWitness(&ext)
+	return w.FromExtWitness(&ext)
 }
 
 // ExtWitness is a witness RLP encoding for transferring across clients.