Skip to content

Commit

Permalink
fix bytecode version for upgrade test (#15758)
Browse files Browse the repository at this point in the history
  • Loading branch information
rahxephon89 authored Jan 16, 2025
1 parent 403abde commit 6716334
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aptos-move/aptos-release-builder/data/example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ proposals:
execution_mode: MultiStep
update_sequence:
- Framework:
bytecode_version: 6
bytecode_version: 7
git_hash: ~
- name: gas
metadata:
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-release-builder/data/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ proposals:
- Gas:
new: current
- Framework:
bytecode_version: 6
bytecode_version: 7
git_hash: ~
- FeatureFlag:
enabled:
Expand Down
1 change: 1 addition & 0 deletions testsuite/smoke-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ diesel = { workspace = true, features = [
digest = { workspace = true }
hex = { workspace = true }
hyper = { workspace = true }
move-binary-format = { workspace = true }
move-core-types = { workspace = true }
reqwest = { workspace = true }
serde = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion testsuite/smoke-test/src/upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use aptos_release_builder::{
};
use aptos_temppath::TempPath;
use aptos_types::on_chain_config::{FeatureFlag as AptosFeatureFlag, OnChainConsensusConfig};
use move_binary_format::file_format_common::VERSION_DEFAULT_LANG_V2;
use std::{fs, path::PathBuf, process::Command, sync::Arc};

// Ignored. This is redundant with the forge compat test but this test is easier to run locally and
Expand Down Expand Up @@ -113,7 +114,7 @@ async fn test_upgrade_flow() {
name: "framework".to_string(),
metadata: ProposalMetadata::default(),
update_sequence: vec![ReleaseEntry::Framework(FrameworkReleaseConfig {
bytecode_version: 6, // TODO: remove explicit bytecode version from sources
bytecode_version: VERSION_DEFAULT_LANG_V2, // TODO: remove explicit bytecode version from sources
git_hash: None,
})],
},
Expand Down

0 comments on commit 6716334

Please sign in to comment.