Remove original feature gating (#20334)

This commit is contained in:
Tyera Eulberg
2021-09-29 23:36:51 -05:00
committed by GitHub
parent 474f2bcdf4
commit 5bdb824267
3 changed files with 4 additions and 11 deletions

View File

@@ -402,9 +402,6 @@ impl Message {
}
pub fn is_writable(&self, i: usize, demote_program_write_locks: bool) -> bool {
let demote_program_id = demote_program_write_locks
&& self.is_key_called_as_program(i)
&& !self.is_upgradeable_loader_present();
(i < (self.header.num_required_signatures - self.header.num_readonly_signed_accounts)
as usize
|| (i >= self.header.num_required_signatures as usize
@@ -414,7 +411,8 @@ impl Message {
let key = self.account_keys[i];
sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key)
}
&& !demote_program_id
&& (!self.is_key_called_as_program(i)
|| (demote_program_write_locks && self.is_upgradeable_loader_present()))
}
pub fn is_signer(&self, i: usize) -> bool {