types/netmap, all: make NetworkMap.SelfNode a tailcfg.NodeView
Updates #1909 Change-Id: I8c470cbc147129a652c1d58eac9b790691b87606 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
699f9699ca
commit
84b94b3146
@@ -151,7 +151,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
n(1, "foo", noExpiry),
|
||||
n(2, "bar", noExpiry),
|
||||
}),
|
||||
SelfNode: n(3, "self", noExpiry),
|
||||
SelfNode: n(3, "self", noExpiry).View(),
|
||||
},
|
||||
want: noExpiry,
|
||||
},
|
||||
@@ -162,7 +162,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
n(1, "foo", noExpiry),
|
||||
n(2, "bar", timeInFuture),
|
||||
}),
|
||||
SelfNode: n(3, "self", noExpiry),
|
||||
SelfNode: n(3, "self", noExpiry).View(),
|
||||
},
|
||||
want: timeInFuture,
|
||||
},
|
||||
@@ -173,7 +173,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
n(1, "foo", noExpiry),
|
||||
n(2, "bar", noExpiry),
|
||||
}),
|
||||
SelfNode: n(3, "self", timeInFuture),
|
||||
SelfNode: n(3, "self", timeInFuture).View(),
|
||||
},
|
||||
want: timeInFuture,
|
||||
},
|
||||
@@ -184,7 +184,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
n(1, "foo", timeInFuture),
|
||||
n(2, "bar", timeInMoreFuture),
|
||||
}),
|
||||
SelfNode: n(3, "self", noExpiry),
|
||||
SelfNode: n(3, "self", noExpiry).View(),
|
||||
},
|
||||
want: timeInFuture,
|
||||
},
|
||||
@@ -194,7 +194,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
Peers: nodeViews([]*tailcfg.Node{
|
||||
n(1, "foo", timeInMoreFuture),
|
||||
}),
|
||||
SelfNode: n(2, "self", timeInFuture),
|
||||
SelfNode: n(2, "self", timeInFuture).View(),
|
||||
},
|
||||
want: timeInFuture,
|
||||
},
|
||||
@@ -202,7 +202,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
name: "only_self",
|
||||
netmap: &netmap.NetworkMap{
|
||||
Peers: nodeViews([]*tailcfg.Node{}),
|
||||
SelfNode: n(1, "self", timeInFuture),
|
||||
SelfNode: n(1, "self", timeInFuture).View(),
|
||||
},
|
||||
want: timeInFuture,
|
||||
},
|
||||
@@ -212,7 +212,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
Peers: nodeViews([]*tailcfg.Node{
|
||||
n(1, "foo", timeInPast),
|
||||
}),
|
||||
SelfNode: n(2, "self", timeInFuture),
|
||||
SelfNode: n(2, "self", timeInFuture).View(),
|
||||
},
|
||||
want: timeInFuture,
|
||||
},
|
||||
@@ -222,7 +222,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
Peers: nodeViews([]*tailcfg.Node{
|
||||
n(1, "foo", timeInFuture),
|
||||
}),
|
||||
SelfNode: n(2, "self", timeInPast),
|
||||
SelfNode: n(2, "self", timeInPast).View(),
|
||||
},
|
||||
want: timeInFuture,
|
||||
},
|
||||
@@ -232,7 +232,7 @@ func TestNextPeerExpiry(t *testing.T) {
|
||||
Peers: nodeViews([]*tailcfg.Node{
|
||||
n(1, "foo", timeInPast),
|
||||
}),
|
||||
SelfNode: n(2, "self", timeInPast),
|
||||
SelfNode: n(2, "self", timeInPast).View(),
|
||||
},
|
||||
want: noExpiry,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user