Skip to content

reduce parameters for func JoinOptionPriority #2550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 1 commit into from
Oct 31, 2020
Merged

reduce parameters for func JoinOptionPriority #2550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ func CreateOptionLoadBalancer() EndpointOption {

// JoinOptionPriority function returns an option setter for priority option to
// be passed to the endpoint.Join() method.
func JoinOptionPriority(ep Endpoint, prio int) EndpointOption {
func JoinOptionPriority(prio int) EndpointOption {
return func(ep *endpoint) {
// ep lock already acquired
c := ep.network.getController()
Expand Down
2 changes: 1 addition & 1 deletion endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fe90::2 somehost.example.com somehost
t.Fatal(err)
}

if err := ep1.Join(sbx, JoinOptionPriority(ep1, 1)); err != nil {
if err := ep1.Join(sbx, JoinOptionPriority(1)); err != nil {
t.Fatal(err)
}

Expand Down
8 changes: 4 additions & 4 deletions sandbox_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ func TestSandboxAddMultiPrio(t *testing.T) {
t.Fatal(err)
}

if err := ep1.Join(sbx, JoinOptionPriority(ep1, 1)); err != nil {
if err := ep1.Join(sbx, JoinOptionPriority(1)); err != nil {
t.Fatal(err)
}

if err := ep2.Join(sbx, JoinOptionPriority(ep2, 2)); err != nil {
if err := ep2.Join(sbx, JoinOptionPriority(2)); err != nil {
t.Fatal(err)
}

if err := ep3.Join(sbx, JoinOptionPriority(ep3, 3)); err != nil {
if err := ep3.Join(sbx, JoinOptionPriority(3)); err != nil {
t.Fatal(err)
}

Expand All @@ -145,7 +145,7 @@ func TestSandboxAddMultiPrio(t *testing.T) {
}

// Re-add ep3 back
if err := ep3.Join(sbx, JoinOptionPriority(ep3, 3)); err != nil {
if err := ep3.Join(sbx, JoinOptionPriority(3)); err != nil {
t.Fatal(err)
}

Expand Down