Skip to content

Remove resolved_early field from *ResolveProposal* struct #71

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

Draft
nizam-supraoracles wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

Remove resolved_early field from *ResolveProposal* struct #71

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc6dd33
remove `resolved_early` field from *ResolveProposal* struct which is …
nizam-supraoracles Sep 18, 2024
cbd20cf
Merge branch 'dev' into fix/cleanup_multisig_voting
nizam-supraoracles Sep 18, 2024
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
7 changes: 0 additions & 7 deletions aptos-move/framework/supra-framework/sources/multisig_voting.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ module supra_framework::multisig_voting {
proposal_id: u64,
yes_votes: u64,
no_votes: u64,
resolved_early: bool
}

struct CreateProposalEvent has drop, store {
Expand Down Expand Up @@ -478,7 +477,6 @@ module supra_framework::multisig_voting {
);
};

let resolved_early = can_be_resolved_early(proposal);
proposal.is_resolved = true;
proposal.resolution_time_secs = timestamp::now_seconds();

Expand All @@ -488,7 +486,6 @@ module supra_framework::multisig_voting {
proposal_id,
yes_votes: proposal.yes_votes,
no_votes: proposal.no_votes,
resolved_early,
},
);
};
Expand All @@ -498,7 +495,6 @@ module supra_framework::multisig_voting {
proposal_id,
yes_votes: proposal.yes_votes,
no_votes: proposal.no_votes,
resolved_early,
},
);

Expand Down Expand Up @@ -570,14 +566,12 @@ module supra_framework::multisig_voting {
// For single-step proposals, we emit one `ResolveProposal` event per proposal.
// For multi-step proposals, we emit one `ResolveProposal` event per step in the multi-step proposal. This means
// that we emit multiple `ResolveProposal` events for the same multi-step proposal.
let resolved_early = can_be_resolved_early(proposal);
if (std::features::module_event_migration_enabled()) {
event::emit(
ResolveProposal {
proposal_id,
yes_votes: proposal.yes_votes,
no_votes: proposal.no_votes,
resolved_early,
},
);
};
Expand All @@ -587,7 +581,6 @@ module supra_framework::multisig_voting {
proposal_id,
yes_votes: proposal.yes_votes,
no_votes: proposal.no_votes,
resolved_early,
},
);

Expand Down