Skip to content

Commit 2be70e1

Browse files
committed
fix: use similar update method.
1 parent b3617c1 commit 2be70e1

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

aptos-move/aptos-release-builder/src/components/feature_flags.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,16 @@ pub fn generate_feature_upgrade_proposal(
185185
generate_features_blob(writer, &disabled);
186186
emitln!(writer, ";\n");
187187

188+
let update_method = if is_testnet {
189+
"change_feature_flags"
190+
} else {
191+
"change_feature_flags_for_next_epoch"
192+
};
193+
188194
emitln!(
189195
writer,
190-
"features::change_feature_flags_for_next_epoch({}, enabled_blob, disabled_blob);",
196+
"features::{}({}, enabled_blob, disabled_blob);",
197+
update_method,
191198
signer_arg
192199
);
193200
emitln!(writer, "aptos_governance::reconfigure({});", signer_arg);

aptos-move/framework/move-stdlib/sources/configs/features.move

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,9 +636,11 @@ module std::features {
636636
///
637637
/// Genesis/tests should use `change_feature_flags_internal()` for feature vec initialization.
638638
///
639+
/// This can be used on testnet prior to successful DKG.
640+
///
639641
/// Governance proposals should use `change_feature_flags_for_next_epoch()` to enable/disable features.
640-
public fun change_feature_flags(_framework: &signer, _enable: vector<u64>, _disable: vector<u64>) {
641-
abort (error::invalid_state(EAPI_DISABLED))
642+
public fun change_feature_flags(framework: &signer, enable: vector<u64>, disable: vector<u64>) {
643+
change_feature_flags_internal(framework, enable, disable)
642644
}
643645

644646
/// Update feature flags directly. Only used in genesis/tests.

0 commit comments

Comments
 (0)