Skip to content

use 1.8.1 also in E2E #263

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 4 commits into from
Sep 5, 2022
Merged

use 1.8.1 also in E2E #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5893d80
bump avago to 1.8.1
holisticode Sep 5, 2022
18cef32
use 1.8.1 also in E2E
felipemadero Sep 5, 2022
6962022
now really bump avago in E2E
felipemadero Sep 5, 2022
976f52e
use 1.8.0 and 1.8.1 in E2E
felipemadero Sep 5, 2022
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 .github/workflows/build-test-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
go-version: 1.18
- name: Run e2e tests
shell: bash
run: scripts/tests.e2e.sh 1.7.15 1.7.16 0.2.4
run: scripts/tests.e2e.sh 1.8.0 1.8.1 0.3.0
release:
needs: [lint_test, unit_test, e2e_test]
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/ava-labs/avalanche-network-runner
go 1.18

require (
github.com/ava-labs/avalanchego v1.7.18
github.com/ava-labs/coreth v0.8.16-rc.2
github.com/ethereum/go-ethereum v1.10.21
github.com/ava-labs/avalanchego v1.8.1
github.com/ava-labs/coreth v0.9.0-rc.4
github.com/ethereum/go-ethereum v1.10.23
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
github.com/onsi/ginkgo/v2 v2.1.6
github.com/onsi/gomega v1.20.2
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
github.com/ava-labs/avalanchego v1.7.18 h1:x4PrTKIyUZkxhPjjf/a4hQLZDUB8netA6oFMw6Z1M+Q=
github.com/ava-labs/avalanchego v1.7.18/go.mod h1:Jo21X9sMxvkZNoo8B7GJbbelGrIJbwFPcMhwanink68=
github.com/ava-labs/coreth v0.8.16-rc.2 h1:Yo6J5faqK9sdnp7yzTIIEGodZqPctvy9l4SLRTVTWck=
github.com/ava-labs/coreth v0.8.16-rc.2/go.mod h1:iOB8EcOy/9yY1+/MAUqI2UM5GUIuIbX2MVKK1gCHqHs=
github.com/ava-labs/avalanchego v1.8.1 h1:V9arHfOvUEV/T8M4KrSpyOX/SSG3avNDSNukeHXAawk=
github.com/ava-labs/avalanchego v1.8.1/go.mod h1:s1Ne9j2n7x5bUr8ocKtYQcnaIVzk6GBxQZCnoK0B8mU=
github.com/ava-labs/coreth v0.9.0-rc.4 h1:lqLI1mqS+bG7gGSJ+ymIkpyczn2AipPMbHQGsYDWnUM=
github.com/ava-labs/coreth v0.9.0-rc.4/go.mod h1:0JhSjgFkdgxexhhY+hE2s8XmtF273jzm5ZgIifq0o5g=
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
Expand Down Expand Up @@ -130,8 +130,8 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ethereum/go-ethereum v1.10.21 h1:5lqsEx92ZaZzRyOqBEXux4/UR06m296RGzN3ol3teJY=
github.com/ethereum/go-ethereum v1.10.21/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
github.com/ethereum/go-ethereum v1.10.23 h1:Xk8XAT4/UuqcjMLIMF+7imjkg32kfVFKoeyQDaO2yWM=
github.com/ethereum/go-ethereum v1.10.23/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
Expand Down
2 changes: 1 addition & 1 deletion local/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (node *localNode) AttachPeer(ctx context.Context, router router.InboundHand
if err != nil {
return nil, err
}
tlsConfg := peer.TLSConfig(*tlsCert)
tlsConfg := peer.TLSConfig(*tlsCert, nil)
clientUpgrader := peer.NewTLSClientUpgrader(tlsConfg)
conn, err := node.getConnFunc(ctx, node)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion local/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
)

func upgradeConn(myTLSCert *tls.Certificate, conn net.Conn) (ids.NodeID, net.Conn, error) {
tlsConfig := peer.TLSConfig(*myTLSCert)
tlsConfig := peer.TLSConfig(*myTLSCert, nil)
upgrader := peer.NewTLSServerUpgrader(tlsConfig)
// this will block until the ssh handshake is done
peerID, tlsConn, _, err := upgrader.Upgrade(conn)
Expand Down
6 changes: 3 additions & 3 deletions scripts/tests.e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ if ! [[ "$0" =~ scripts/tests.e2e.sh ]]; then
exit 255
fi

DEFAULT_VERSION_1=1.7.15
DEFAULT_VERSION_2=1.7.16
DEFAULT_SUBNET_EVM_VERSION=0.2.4
DEFAULT_VERSION_1=1.8.0
DEFAULT_VERSION_2=1.8.1
DEFAULT_SUBNET_EVM_VERSION=0.3.0

if [ $# == 0 ]; then
VERSION_1=$DEFAULT_VERSION_1
Expand Down