Skip to content
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

Jump to bottom

ANR@v1.7.2 #489

Merged
merged 2 commits into from
Sep 20, 2023
Merged

ANR@v1.7.2 #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e8ada1
update ANR
patrick-ogrady Sep 20, 2023
fc9aa75
re-enable profiling
patrick-ogrady Sep 20, 2023
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 examples/morpheusvm/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/ava-labs/hypersdk/examples/morpheusvm
go 1.20

require (
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02
github.com/ava-labs/avalanche-network-runner v1.7.2
github.com/ava-labs/avalanchego v1.10.10
github.com/ava-labs/hypersdk v0.0.1
github.com/fatih/color v1.13.0
Expand Down
4 changes: 2 additions & 2 deletions examples/morpheusvm/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02 h1:VThDljvPfIWneBO6Y99Nboe3yrJwI8clhRiQ9zuHVB8=
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02/go.mod h1:euKHwZ77sGvGfhVj4v9WPM4jD2b5N80ldE2XHqO7lwA=
github.com/ava-labs/avalanche-network-runner v1.7.2 h1:XFad/wZfYzDnqbLzPAPPRYU3a1Zc8QT8x5dtLTS3lUo=
github.com/ava-labs/avalanche-network-runner v1.7.2/go.mod h1:naLveusSrP7YgTAqRykD1SyLOAUilCp9jGjk3MDxoPI=
github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
Expand Down
6 changes: 3 additions & 3 deletions examples/morpheusvm/scripts/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ if ${UNLIMITED_USAGE}; then
fi

echo "Running with:"
echo LOGLEVEL: ${LOGLEVEL}
echo VERSION: ${VERSION}
echo MODE: ${MODE}
echo LOG LEVEL: ${LOGLEVEL}
Expand Down Expand Up @@ -149,13 +150,12 @@ cat <<EOF > ${TMPDIR}/morpheusvm.config
"storeTransactions": ${STORE_TXS},
"streamingBacklogSize": 10000000,
"logLevel": "${LOGLEVEL}",
"continuousProfilerDir":"${TMPDIR}/morpheusvm-e2e-profiles/*",
"stateSyncServerDelay": ${STATESYNC_DELAY}
}
EOF
mkdir -p ${TMPDIR}/morpheusvm-e2e-profiles

# Profiling config: {"continuousProfilerDir":"${TMPDIR}/morpheusvm-e2e-profiles/*"}

############################

############################
Expand Down Expand Up @@ -191,7 +191,7 @@ ACK_GINKGO_RC=true ginkgo build ./tests/e2e
# download avalanche-network-runner
# https://github.com/ava-labs/avalanche-network-runner
ANR_REPO_PATH=github.com/ava-labs/avalanche-network-runner
ANR_VERSION=fbe081616f02dd0142cc5923168c43ed5991d947
ANR_VERSION=v1.7.2
# version set
go install -v ${ANR_REPO_PATH}@${ANR_VERSION}

Expand Down
4 changes: 1 addition & 3 deletions examples/morpheusvm/tests/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ var _ = ginkgo.BeforeSuite(func() {
runner_sdk.WithPluginDir(pluginDir),
// We don't disable PUT gossip here because the E2E test adds multiple
// non-validating nodes (which will fall behind).
//
// TODO: re-enable profiling
runner_sdk.WithGlobalNodeConfig(`{
"log-level":"info",
"log-display-level":"info",
Expand All @@ -235,7 +233,7 @@ var _ = ginkgo.BeforeSuite(func() {
"consensus-on-accept-gossip-peer-size":"10",
"network-compression-type":"zstd",
"consensus-app-concurrency":"512",
"profile-continuous-enabled":false,
"profile-continuous-enabled":true,
"profile-continuous-freq":"1m",
"http-host":"",
"http-allowed-origins": "*",
Expand Down
2 changes: 1 addition & 1 deletion examples/tokenvm/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/ava-labs/hypersdk/examples/tokenvm
go 1.20

require (
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02
github.com/ava-labs/avalanche-network-runner v1.7.2
github.com/ava-labs/avalanchego v1.10.10
github.com/ava-labs/hypersdk v0.0.1
github.com/fatih/color v1.13.0
Expand Down
4 changes: 2 additions & 2 deletions examples/tokenvm/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02 h1:VThDljvPfIWneBO6Y99Nboe3yrJwI8clhRiQ9zuHVB8=
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02/go.mod h1:euKHwZ77sGvGfhVj4v9WPM4jD2b5N80ldE2XHqO7lwA=
github.com/ava-labs/avalanche-network-runner v1.7.2 h1:XFad/wZfYzDnqbLzPAPPRYU3a1Zc8QT8x5dtLTS3lUo=
github.com/ava-labs/avalanche-network-runner v1.7.2/go.mod h1:naLveusSrP7YgTAqRykD1SyLOAUilCp9jGjk3MDxoPI=
github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
Expand Down
6 changes: 3 additions & 3 deletions examples/tokenvm/scripts/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ if ${UNLIMITED_USAGE}; then
fi

echo "Running with:"
echo LOGLEVEL: ${LOGLEVEL}
echo VERSION: ${VERSION}
echo MODE: ${MODE}
echo STATESYNC_DELAY \(ns\): ${STATESYNC_DELAY}
Expand Down Expand Up @@ -156,13 +157,12 @@ cat <<EOF > ${TMPDIR}/tokenvm.config
"streamingBacklogSize": 10000000,
"trackedPairs":["*"],
"logLevel": "${LOGLEVEL}",
"continuousProfilerDir":"${TMPDIR}/tokenvm-e2e-profiles/*",
"stateSyncServerDelay": ${STATESYNC_DELAY}
}
EOF
mkdir -p ${TMPDIR}/tokenvm-e2e-profiles

# Profiling config: {"continuousProfilerDir":"${TMPDIR}/tokenvm-e2e-profiles/*"}

############################

############################
Expand Down Expand Up @@ -198,7 +198,7 @@ ACK_GINKGO_RC=true ginkgo build ./tests/e2e
# download avalanche-network-runner
# https://github.com/ava-labs/avalanche-network-runner
ANR_REPO_PATH=github.com/ava-labs/avalanche-network-runner
ANR_VERSION=fbe081616f02dd0142cc5923168c43ed5991d947
ANR_VERSION=v1.7.2
# version set
go install -v ${ANR_REPO_PATH}@${ANR_VERSION}

Expand Down
5 changes: 2 additions & 3 deletions examples/tokenvm/tests/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,8 @@ var _ = ginkgo.BeforeSuite(func() {
runner_sdk.WithPluginDir(pluginDir),
// We don't disable PUT gossip here because the E2E test adds multiple
// non-validating nodes (which will fall behind).
//
// TODO: re-enable profiling
runner_sdk.WithGlobalNodeConfig(`{
"log-level":"info",
"log-display-level":"info",
"proposervm-use-current-height":true,
"throttler-inbound-validator-alloc-size":"10737418240",
Expand All @@ -228,7 +227,7 @@ var _ = ginkgo.BeforeSuite(func() {
"consensus-on-accept-gossip-peer-size":"10",
"network-compression-type":"zstd",
"consensus-app-concurrency":"512",
"profile-continuous-enabled":false,
"profile-continuous-enabled":true,
"profile-continuous-freq":"1m",
"http-host":"",
"http-allowed-origins": "*",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/NYTimes/gziphandler v1.1.1
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02
github.com/ava-labs/avalanche-network-runner v1.7.2
github.com/ava-labs/avalanchego v1.10.10
github.com/cockroachdb/pebble v0.0.0-20230224221607-fccb83b60d5c
github.com/golang/mock v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02 h1:VThDljvPfIWneBO6Y99Nboe3yrJwI8clhRiQ9zuHVB8=
github.com/ava-labs/avalanche-network-runner v1.7.2-0.20230825184751-fbe081616f02/go.mod h1:euKHwZ77sGvGfhVj4v9WPM4jD2b5N80ldE2XHqO7lwA=
github.com/ava-labs/avalanche-network-runner v1.7.2 h1:XFad/wZfYzDnqbLzPAPPRYU3a1Zc8QT8x5dtLTS3lUo=
github.com/ava-labs/avalanche-network-runner v1.7.2/go.mod h1:naLveusSrP7YgTAqRykD1SyLOAUilCp9jGjk3MDxoPI=
github.com/ava-labs/avalanchego v1.10.10 h1:EYX4LVotcfdtIQ0nJSBTcoisubx/Bzk2tM1aP3yiYiw=
github.com/ava-labs/avalanchego v1.10.10/go.mod h1:6UA0nxxTvvpyuCbP2DSzx9+7uWQfQx9DPApK8JptLiE=
github.com/ava-labs/coreth v0.12.5-rc.6 h1:OajGUyKkO5Q82XSuMa8T5UD6QywtCHUiZ4Tv3RFmRBU=
Expand Down
Loading