fix merge conflict (#15085)
This commit is contained in:
parent
600ff0d915
commit
e7f53182e2
|
@ -313,16 +313,6 @@ impl<'a> LoadedAccount<'a> {
|
|||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn lamports(&self) -> u64 {
|
||||
match self {
|
||||
LoadedAccount::Stored(stored_account_meta) => stored_account_meta.account_meta.lamports,
|
||||
LoadedAccount::Cached((_, cached_account)) => match cached_account {
|
||||
Cow::Owned(cached_account) => cached_account.account.lamports,
|
||||
Cow::Borrowed(cached_account) => cached_account.account.lamports,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Default, Debug)]
|
||||
|
|
Loading…
Reference in New Issue