From 08c4626facb6ad45311f60fa23b3f03d311afcad Mon Sep 17 00:00:00 2001 From: Stephen Buttolph Date: Thu, 24 Oct 2024 11:29:56 -0400 Subject: [PATCH] fix merge --- vms/platformvm/network/warp.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vms/platformvm/network/warp.go b/vms/platformvm/network/warp.go index c774c37e2bde..911e407263f3 100644 --- a/vms/platformvm/network/warp.go +++ b/vms/platformvm/network/warp.go @@ -109,7 +109,7 @@ func (s signatureRequestVerifier) verifySubnetConversion( s.stateLock.Lock() defer s.stateLock.Unlock() - conversionID, _, _, err := s.state.GetSubnetConversion(subnetID) + conversion, err := s.state.GetSubnetConversion(subnetID) if err == database.ErrNotFound { return &common.AppError{ Code: ErrConversionDoesNotExist, @@ -123,10 +123,10 @@ func (s signatureRequestVerifier) verifySubnetConversion( } } - if msg.ID != conversionID { + if msg.ID != conversion.ConversionID { return &common.AppError{ Code: ErrMismatchedConversionID, - Message: fmt.Sprintf("provided conversionID %q != expected conversionID %q", msg.ID, conversionID), + Message: fmt.Sprintf("provided conversionID %q != expected conversionID %q", msg.ID, conversion.ConversionID), } }