Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
riptl committed Mar 30, 2024
1 parent 30b2664 commit 92a380c
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 126 deletions.
173 changes: 76 additions & 97 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["cdylib", "rlib"]
crate-type = ["cdylib"]

[dependencies]
bincode = "1.3.3"
clap = { version = "4.5.2", features = ["derive"] }
clap = { version = "3", features = ["derive"] }
lazy_static = "1.4.0"
prost = "0.11.9"
prost-types = "0.11.9"
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ cargo test
Build:

```sh
make toolchain
make build
```

Expand Down
24 changes: 0 additions & 24 deletions src/bin/agave_compat.rs

This file was deleted.

15 changes: 13 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use solana_program_runtime::sysvar_cache::SysvarCache;
use solana_program_runtime::timings::ExecuteTimings;
use solana_sdk::account::ReadableAccount;
use solana_sdk::account::{Account, AccountSharedData};
use solana_sdk::feature_set::FeatureSet;
use solana_sdk::feature_set::*;
use solana_sdk::instruction::AccountMeta;
use solana_sdk::instruction::InstructionError;
Expand Down Expand Up @@ -609,7 +608,11 @@ mod tests {
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
],
cu_avail: 10000u64,
epoch_context: None,
epoch_context: Some(proto::EpochContext {
features: Some(proto::FeatureSet {
features: vec![feature_u64(&native_programs_consume_cu::id())],
}),
}),
slot_context: None,
txn_context: None,
};
Expand All @@ -636,6 +639,14 @@ mod tests {
executable: false,
rent_epoch: 0,
},
proto::AcctState {
address: vec![0u8; 32],
owner: solana_sdk::native_loader::id().to_bytes().to_vec(),
lamports: 10000000,
data: b"Solana Program".to_vec(),
executable: true,
rent_epoch: 0,
},
],
cu_avail: 9850u64,
})
Expand Down

0 comments on commit 92a380c

Please sign in to comment.