rebase fix

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

token/core/common/validator_version_test.go

@@ -106,4 +106,3 @@ func TestMinProtocolVersionLogic(t *testing.T) {
 		})
 	}
 }
-

token/driver/asn1_fast.go

@@ -170,4 +170,3 @@ func appendLength(buf []byte, length int) []byte {
 
 	return append(buf, 0x84, lengthBytes[0], lengthBytes[1], lengthBytes[2], lengthBytes[3])
 }
-

token/driver/asn1_fast_bench_test.go

@@ -327,4 +327,3 @@ func BenchmarkManySmallItems_Std(b *testing.B) {
 		}
 	}
 }
-

token/driver/asn1_fast_test.go

@@ -357,4 +357,3 @@ func TestFastMarshalDeterministic(t *testing.T) {
 	assert.True(t, bytes.Equal(result1, result2))
 	assert.True(t, bytes.Equal(result2, result3))
 }
-

token/driver/request.go

@@ -288,17 +288,6 @@ func (r *TokenRequest) MarshalToMessageToSign(anchor []byte) ([]byte, error) {
 	return r.marshalToMessageToSignV1(anchor)
 }
 
-// getVersion returns the protocol version of this TokenRequest.
-// Returns the stored version, defaulting to V1 (structured format) for new requests.
-func (r *TokenRequest) getVersion() int {
-	if r.Version == 0 {
-		// Default to V1 (structured format) for new requests
-		return ProtocolV1
-	}
-
-	return int(r.Version)
-}
-
 // marshalToMessageToSignV1 implements the V1 protocol signature message construction
 // using a secure structured ASN.1 format that prevents hash collision vulnerabilities.
 //

token/driver/request_test.go

@@ -1881,7 +1881,6 @@ func TestTokenRequest_VersionPreservation(t *testing.T) {
 	err = trV1Restored.FromBytes(bytes)
 	require.NoError(t, err)
 	assert.Equal(t, uint32(ProtocolV1), trV1Restored.Version, "V1 version should be preserved")
-	assert.Equal(t, ProtocolV1, trV1Restored.getVersion(), "getVersion should return V1")
 
 	// Test default to V1 for new requests
 	trNew := &TokenRequest{
@@ -1897,7 +1896,6 @@ func TestTokenRequest_VersionPreservation(t *testing.T) {
 	err = trNewRestored.FromBytes(bytes)
 	require.NoError(t, err)
 	assert.Equal(t, uint32(ProtocolV1), trNewRestored.Version, "New requests should default to V1")
-	assert.Equal(t, ProtocolV1, trNewRestored.getVersion(), "getVersion should return V1 for new requests")
 }
 
 // TestMarshalToMessageToSign_V1_StructuredFormat verifies V1 uses structured ASN.1 format

token/services/storage/auditdb/store_test.go

@@ -342,4 +342,3 @@ func TestAcquireAndReleaseLocks_Integration(t *testing.T) {
 	// Clean up
 	store.ReleaseLocks(ctx, "anchor_integration2")
 }
-

token/services/storage/db/sql/postgres/driver_test.go

@@ -90,4 +90,3 @@ CREATE INDEX IF NOT EXISTS idx1 ON table1(id);`
 	require.Contains(t, result, "CREATE TABLE IF NOT EXISTS table2")
 	require.Contains(t, result, "CREATE INDEX IF NOT EXISTS idx1")
 }
-