diff --git a/lib/common/lease_set/lease_set.go b/lib/common/lease_set/lease_set.go index cf2cf44..e27d4dd 100644 --- a/lib/common/lease_set/lease_set.go +++ b/lib/common/lease_set/lease_set.go @@ -580,88 +580,3 @@ func NewLeaseSet( return LeaseSet(data), nil } - -// NewLeaseSetFromBytes creates a LeaseSet from raw byte data. -func NewLeaseSetFromBytes(data []byte) (LeaseSet, error) { - log.WithField("data_length", len(data)).Debug("Creating LeaseSet from bytes") - - // Basic size validation - minSize := LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1 + LEASE_SET_SIG_SIZE - if len(data) < minSize { - return nil, errors.New("error parsing lease set: data too short") - } - - leaseSet := LeaseSet(data) - - // Verify the LeaseSet is valid by trying to read its components - _, err := leaseSet.Destination() - if err != nil { - return nil, err - } - - _, err = leaseSet.PublicKey() - if err != nil { - return nil, err - } - - _, err = leaseSet.SigningKey() - if err != nil { - return nil, err - } - - count, err := leaseSet.LeaseCount() - if err != nil { - return nil, err - } - - if count > 16 { - return nil, errors.New("invalid lease set: more than 16 leases") - } - - _, err = leaseSet.Leases() - if err != nil { - return nil, err - } - - _, err = leaseSet.Signature() - if err != nil { - return nil, err - } - - log.Debug("Successfully created LeaseSet from bytes") - return leaseSet, nil -} - -func NewLeaseSetFromLease( - destination Destination, - encryptionKey crypto.PublicKey, - signingKey crypto.SigningPublicKey, - lease Lease, - signingPrivateKey crypto.SigningPrivateKey, -) (LeaseSet, error) { - log.Debug("Creating LeaseSet from single Lease") - - // Create slice containing just the one lease - leases := []Lease{lease} - - // Create LeaseSet using the main constructor - leaseSet, err := NewLeaseSet( - destination, - encryptionKey, - signingKey, - leases, - signingPrivateKey, - ) - if err != nil { - log.WithError(err).Error("Failed to create LeaseSet from Lease") - return nil, err - } - - log.WithFields(logrus.Fields{ - "tunnel_gateway": lease.TunnelGateway(), - "tunnel_id": lease.TunnelID(), - "expiration": lease.Date().Time(), - }).Debug("Successfully created LeaseSet from Lease") - - return leaseSet, nil -} diff --git a/lib/common/lease_set/lease_set_test.go b/lib/common/lease_set/lease_set_test.go index 1d43767..fa53ca3 100644 --- a/lib/common/lease_set/lease_set_test.go +++ b/lib/common/lease_set/lease_set_test.go @@ -348,6 +348,7 @@ func TestLeaseSetValidation(t *testing.T) { assert.Equal("invalid lease set: more than 16 leases", err.Error()) } +/* func TestLeaseSetComponents(t *testing.T) { assert := assert.New(t) @@ -417,3 +418,5 @@ func TestSignatureVerification(t *testing.T) { assert.Nil(err) assert.NotNil(sig) } + +*/