Skip to content

Patch version handling #348

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
merged 3 commits into from
Aug 30, 2020
Merged

Patch version handling #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
291c630
Merge pull request #319 from ava-labs/dev
StephenButtolph Aug 25, 2020
e9a6561
updated version compatiblity handling
StephenButtolph Aug 30, 2020
f373a37
Merge branch 'dev' into patch-version-handling
StephenButtolph Aug 30, 2020
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
9 changes: 7 additions & 2 deletions network/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,13 @@ func (p *peer) version(msg Msg) {
if err := p.net.version.Compatible(peerVersion); err != nil {
p.net.log.Debug("peer version not compatible due to %s", err)

p.discardIP()
return
if !p.net.beacons.Contains(p.id) {
p.discardIP()
return
}
p.net.log.Info("allowing beacon %s to connect with a lower version %s",
p.id,
peerVersion)
}

if p.ip.IsZero() {
Expand Down
4 changes: 2 additions & 2 deletions version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ func (v *version) Compatible(o Version) error {
switch {
case v.App() != o.App():
return errDifferentApps
case v.Major() != o.Major():
case v.Major() > o.Major():
return errDifferentMajor
case v.Minor() != o.Minor():
case v.Major() == o.Major() && v.Minor() > o.Minor():
return errDifferentMinor
default:
return nil
Expand Down
130 changes: 80 additions & 50 deletions version/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package version

import (
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -35,54 +36,83 @@ func TestNewVersion(t *testing.T) {
assert.False(t, v.Before(v))
}

func TestIncompatibleApps(t *testing.T) {
v0 := NewDefaultVersion("avalanche", 1, 2, 3)
v1 := NewDefaultVersion("notavalanche", 1, 2, 3)

assert.NotNil(t, v0)
assert.NotNil(t, v1)
assert.Error(t, v0.Compatible(v1))
assert.Error(t, v1.Compatible(v0))

assert.False(t, v0.Before(v1))
assert.False(t, v1.Before(v0))
}

func TestIncompatibleMajor(t *testing.T) {
v0 := NewDefaultVersion("avalanche", 1, 2, 3)
v1 := NewDefaultVersion("avalanche", 2, 2, 3)

assert.NotNil(t, v0)
assert.NotNil(t, v1)
assert.Error(t, v0.Compatible(v1))
assert.Error(t, v1.Compatible(v0))

assert.True(t, v0.Before(v1))
assert.False(t, v1.Before(v0))
}

func TestIncompatibleMinor(t *testing.T) {
v0 := NewDefaultVersion("avalanche", 1, 2, 3)
v1 := NewDefaultVersion("avalanche", 1, 3, 3)

assert.NotNil(t, v0)
assert.NotNil(t, v1)
assert.Error(t, v0.Compatible(v1))
assert.Error(t, v1.Compatible(v0))

assert.True(t, v0.Before(v1))
assert.False(t, v1.Before(v0))
}

func TestCompatiblePatch(t *testing.T) {
v0 := NewDefaultVersion("avalanche", 1, 2, 3)
v1 := NewDefaultVersion("avalanche", 1, 2, 4)

assert.NotNil(t, v0)
assert.NotNil(t, v1)
assert.NoError(t, v0.Compatible(v1))
assert.NoError(t, v1.Compatible(v0))

assert.True(t, v0.Before(v1))
assert.False(t, v1.Before(v0))
func TestComparingVersions(t *testing.T) {
tests := []struct {
myVersion Version
peerVersion Version
compatible bool
before bool
}{
{
myVersion: NewDefaultVersion("avalanche", 1, 2, 3),
peerVersion: NewDefaultVersion("avalanche", 1, 2, 3),
compatible: true,
before: false,
},
{
myVersion: NewDefaultVersion("avalanche", 1, 2, 4),
peerVersion: NewDefaultVersion("avalanche", 1, 2, 3),
compatible: true,
before: false,
},
{
myVersion: NewDefaultVersion("avalanche", 1, 2, 3),
peerVersion: NewDefaultVersion("avalanche", 1, 2, 4),
compatible: true,
before: true,
},
{
myVersion: NewDefaultVersion("avalanche", 1, 3, 3),
peerVersion: NewDefaultVersion("avalanche", 1, 2, 3),
compatible: false,
before: false,
},
{
myVersion: NewDefaultVersion("avalanche", 1, 2, 3),
peerVersion: NewDefaultVersion("avalanche", 1, 3, 3),
compatible: true,
before: true,
},
{
myVersion: NewDefaultVersion("avalanche", 2, 2, 3),
peerVersion: NewDefaultVersion("avalanche", 1, 2, 3),
compatible: false,
before: false,
},
{
myVersion: NewDefaultVersion("avalanche", 1, 2, 3),
peerVersion: NewDefaultVersion("avalanche", 2, 2, 3),
compatible: true,
before: true,
},
{
myVersion: NewDefaultVersion("avax", 1, 2, 4),
peerVersion: NewDefaultVersion("avalanche", 1, 2, 3),
compatible: false,
before: false,
},
{
myVersion: NewDefaultVersion("avalanche", 1, 2, 3),
peerVersion: NewDefaultVersion("avax", 1, 2, 3),
compatible: false,
before: false,
},
}
for _, test := range tests {
t.Run(fmt.Sprintf("%s %s", test.myVersion, test.peerVersion), func(t *testing.T) {
err := test.myVersion.Compatible(test.peerVersion)
if test.compatible && err != nil {
t.Fatalf("Expected version to be compatible but returned: %s",
err)
} else if !test.compatible && err == nil {
t.Fatalf("Expected version to be incompatible but returned no error")
}
before := test.myVersion.Before(test.peerVersion)
if test.before && !before {
t.Fatalf("Expected version to be before the peer version but wasn't")
} else if !test.before && before {
t.Fatalf("Expected version not to be before the peer version but was")
}
})
}
}