Merge branch 'implement-acp-77-disable-subnet-validator-tx' into impl…

…ement-acp-77-logging
ava-labs · Oct 24, 2024 · c9214ef · c9214ef
2 parents 2fef7c8 + b598793
commit c9214ef
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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),
 		}
 	}