From cddfa5d0994c641db097be1bcb4dcedc579fd9f2 Mon Sep 17 00:00:00 2001
From: tsachiherman <24438559+tsachiherman@users.noreply.github.com>
Date: Tue, 28 Jan 2025 15:35:05 -0500
Subject: [PATCH] bugfix

---
 vms/example/xsvm/execute/tx.go               | 2 +-
 vms/platformvm/txs/executor/warp_verifier.go | 2 +-
 vms/platformvm/warp/signature_test.go        | 2 +-
 vms/platformvm/warp/validator.go             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vms/example/xsvm/execute/tx.go b/vms/example/xsvm/execute/tx.go
index 4138b8e9282e..d886ee8ee612 100644
--- a/vms/example/xsvm/execute/tx.go
+++ b/vms/example/xsvm/execute/tx.go
@@ -164,7 +164,7 @@ func (t *Tx) Import(i *tx.Import) error {
 		return errs.Err
 	}
 
-	validators, err := warp.GetCanonicalValidatorSetFromSubnetID(
+	validators, err := warp.GetCanonicalValidatorSetFromChainID(
 		t.Context,
 		t.ChainContext.ValidatorState,
 		t.BlockContext.PChainHeight,
diff --git a/vms/platformvm/txs/executor/warp_verifier.go b/vms/platformvm/txs/executor/warp_verifier.go
index e32968115b52..758b851ef90d 100644
--- a/vms/platformvm/txs/executor/warp_verifier.go
+++ b/vms/platformvm/txs/executor/warp_verifier.go
@@ -128,7 +128,7 @@ func (w *warpVerifier) verify(message []byte) error {
 		return err
 	}
 
-	validators, err := warp.GetCanonicalValidatorSetFromSubnetID(
+	validators, err := warp.GetCanonicalValidatorSetFromChainID(
 		w.context,
 		w.validatorState,
 		w.pChainHeight,
diff --git a/vms/platformvm/warp/signature_test.go b/vms/platformvm/warp/signature_test.go
index 28180bb51928..7bd92cc870c2 100644
--- a/vms/platformvm/warp/signature_test.go
+++ b/vms/platformvm/warp/signature_test.go
@@ -850,7 +850,7 @@ func TestSignatureVerification(t *testing.T) {
 			msg := tt.msgF(require)
 			pChainState := tt.stateF(ctrl)
 
-			validators, err := GetCanonicalValidatorSetFromSubnetID(
+			validators, err := GetCanonicalValidatorSetFromChainID(
 				context.Background(),
 				pChainState,
 				pChainHeight,
diff --git a/vms/platformvm/warp/validator.go b/vms/platformvm/warp/validator.go
index e6988118e15b..b4756e9e5bf0 100644
--- a/vms/platformvm/warp/validator.go
+++ b/vms/platformvm/warp/validator.go
@@ -51,7 +51,7 @@ func (v *Validator) Compare(o *Validator) int {
 }
 
 // GetCanonicalValidatorSetFromSubnetID returns the CanonicalValidatorSet of [subnetID] at
-// [pChcainHeight] in a canonical ordering. CanonicalValidatorSet includes the validator set
+// [pChcainHeight]. The returned CanonicalValidatorSet includes the validator set in a canonical ordering
 // and the total weight.
 func GetCanonicalValidatorSetFromSubnetID(
 	ctx context.Context,