TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-12 05:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

various: use NodePublic.AsNodeKey() instead of tailcfg.NodeKeyFromNodePublic()

Browse Source 
Updates #3206

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2021-10-29 16:19:27 -07:00
parent ff16e58d23
commit 418adae379
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipn/ipnlocal/local.go
View File

@@ -2692,7 +2692,7 @@ func (b *LocalBackend) TestOnlyPublicKeys() (machineKey key.MachinePublic, nodeK
mk := machinePrivKey.Public()
nk := prefs.Persist.PrivateNodeKey.Public()
return mk, tailcfg.NodeKeyFromNodePublic(nk)
return mk, nk.AsNodeKey()
}
func (b *LocalBackend) WaitingFiles() ([]apitype.WaitingFile, error) {
@@ -2782,7 +2782,7 @@ func (b *LocalBackend) SetDNS(ctx context.Context, name, value string) error {
b.mu.Lock()
cc := b.cc
if prefs := b.prefs; prefs != nil {
req.NodeKey = tailcfg.NodeKeyFromNodePublic(prefs.Persist.PrivateNodeKey.Public())
req.NodeKey = prefs.Persist.PrivateNodeKey.Public().AsNodeKey()
}
b.mu.Unlock()
if cc == nil {

4
ipn/ipnlocal/loglines_test.go
View File

@@ -90,7 +90,7 @@ func TestLocalLogLines(t *testing.T) {
TxBytes: 10,
RxBytes: 10,
LastHandshake: time.Now(),
NodeKey: tailcfg.NodeKeyFromNodePublic(key.NewNode().Public()),
NodeKey: key.NewNode().Public().AsNodeKey(),
}},
})
lb.mu.Unlock()
@@ -105,7 +105,7 @@ func TestLocalLogLines(t *testing.T) {
TxBytes: 11,
RxBytes: 12,
LastHandshake: time.Now(),
NodeKey: tailcfg.NodeKeyFromNodePublic(key.NewNode().Public()),
NodeKey: key.NewNode().Public().AsNodeKey(),
}},
})
lb.mu.Unlock()