blockworks-foundation
/
anchor
mirror of https://github.com/blockworks-foundation/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "client: allow execution stack to have multiple program ids (#1954)" (#2282) 

This reverts commit 52b32d2459.
This commit is contained in:
Henry-E 2022-11-24 15:16:37 +00:00 committed by GitHub
parent ca52121a6b
commit 686c97e45b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
client/src/lib.rs
View File

@ -334,19 +334,21 @@ struct Execution {
impl Execution {
pub fn new(logs: &mut &[String]) -> Result<Self, ClientError> {
let l = &logs[0];
*logs = &logs[1..];
let re = Regex::new(r"^Program (.*) invoke.*$").unwrap();
let programs: Vec<String> = logs
.iter()
.filter_map(|l| re.captures(l))
.filter_map(|str| str.get(1))
.map(|matched_item| matched_item.as_str().to_string())
.collect();
if programs.is_empty() {
return Err(ClientError::MissingInvokeLogError());
}
Ok(Self { stack: programs })
let c = re
.captures(l)
.ok_or_else(|| ClientError::LogParseError(l.to_string()))?;
let program = c
.get(1)
.ok_or_else(|| ClientError::LogParseError(l.to_string()))?
.as_str()
.to_string();
Ok(Self {
stack: vec![program],
})
}
pub fn program(&self) -> String {
@ -384,8 +386,6 @@ pub enum ClientError {
SolanaClientPubsubError(#[from] PubsubClientError),
#[error("Unable to parse log: {0}")]
LogParseError(String),
#[error("Program invoke log is missing")]
MissingInvokeLogError(),
}
/// `RequestBuilder` provides a builder interface to create and send
@ -605,25 +605,6 @@ mod tests {
);
}
#[test]
fn new_execution_multiple_instruction() {
let mut logs: &[String] = &[
"Program 7Y8VDzehoewALqJfyxZYMgYCnMTCDhWuGfJKUvjYWATw invoke [1]".to_string(),
"Program 7y8vdZEHOEWalQjFYXzymGycNmtcdHwUgFjkuVJywatW invoke [1]".to_string(),
];
let exe = Execution::new(&mut logs).unwrap();
assert!(exe.stack.len() == 2);
assert_eq!(
exe.stack[0],
"7Y8VDzehoewALqJfyxZYMgYCnMTCDhWuGfJKUvjYWATw".to_string()
);
assert_eq!(
exe.stack[1],
"7y8vdZEHOEWalQjFYXzymGycNmtcdHwUgFjkuVJywatW".to_string()
);
}
#[test]
fn handle_system_log_pop() {
let log = "Program 7Y8VDzehoewALqJfyxZYMgYCnMTCDhWuGfJKUvjYWATw success";