Skip to content

Commit ce7d867

Browse files
committed
Fix docs and tests
1 parent f4b86e5 commit ce7d867

File tree

4 files changed

+61
-62
lines changed

4 files changed

+61
-62
lines changed

packages/vm/benches/main.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ fn bench_cache(c: &mut Criterion) {
151151
unsafe { Cache::new(options.clone()).unwrap() };
152152

153153
b.iter(|| {
154-
let result = cache.save_wasm(HACKATOM);
154+
let result = cache.store_code(HACKATOM, true, true);
155155
assert!(result.is_ok());
156156
});
157157
});
158158

159159
group.bench_function("load wasm", |b| {
160160
let cache: Cache<MockApi, MockStorage, MockQuerier> =
161161
unsafe { Cache::new(options.clone()).unwrap() };
162-
let checksum = cache.save_wasm(HACKATOM).unwrap();
162+
let checksum = cache.store_code(HACKATOM, true, true).unwrap();
163163

164164
b.iter(|| {
165165
let result = cache.load_wasm(&checksum);
@@ -172,7 +172,7 @@ fn bench_cache(c: &mut Criterion) {
172172
let mut cache: Cache<MockApi, MockStorage, MockQuerier> =
173173
unsafe { Cache::new(options).unwrap() };
174174
cache.set_module_unchecked(true);
175-
let checksum = cache.save_wasm(HACKATOM).unwrap();
175+
let checksum = cache.store_code(HACKATOM, true, true).unwrap();
176176

177177
b.iter(|| {
178178
let result = cache.load_wasm(&checksum);
@@ -184,7 +184,7 @@ fn bench_cache(c: &mut Criterion) {
184184
let contract_wasm = fs::read(format!("testdata/{contract_name}")).unwrap();
185185
let cache: Cache<MockApi, MockStorage, MockQuerier> =
186186
unsafe { Cache::new(options.clone()).unwrap() };
187-
let checksum = cache.save_wasm(&contract_wasm).unwrap();
187+
let checksum = cache.store_code(&contract_wasm, true, true).unwrap();
188188

189189
group.bench_function(format!("analyze_{contract_name}"), |b| {
190190
b.iter(|| {
@@ -203,7 +203,7 @@ fn bench_cache(c: &mut Criterion) {
203203
);
204204
let cache: Cache<MockApi, MockStorage, MockQuerier> =
205205
unsafe { Cache::new(non_memcache).unwrap() };
206-
let checksum = cache.save_wasm(HACKATOM).unwrap();
206+
let checksum = cache.store_code(HACKATOM, true, true).unwrap();
207207

208208
b.iter(|| {
209209
let _ = cache
@@ -226,7 +226,7 @@ fn bench_cache(c: &mut Criterion) {
226226
let mut cache: Cache<MockApi, MockStorage, MockQuerier> =
227227
unsafe { Cache::new(non_memcache).unwrap() };
228228
cache.set_module_unchecked(true);
229-
let checksum = cache.save_wasm(HACKATOM).unwrap();
229+
let checksum = cache.store_code(HACKATOM, true, true).unwrap();
230230

231231
b.iter(|| {
232232
let _ = cache
@@ -321,8 +321,8 @@ fn bench_instance_threads(c: &mut Criterion) {
321321
// Splice data in contract
322322
contract.splice(offset..offset + leb128_buf.len(), leb128_buf);
323323

324-
cache.save_wasm(contract.as_slice()).unwrap()
325-
// let checksum = cache.save_wasm(contract.as_slice()).unwrap();
324+
cache.store_code(contract.as_slice(), true, true).unwrap()
325+
// let checksum = cache.store_code(contract.as_slice(), true, true).unwrap();
326326
// Preload into memory
327327
// cache
328328
// .get_instance(&checksum, mock_backend(&[]), DEFAULT_INSTANCE_OPTIONS)
@@ -381,7 +381,7 @@ fn bench_combined(c: &mut Criterion) {
381381
let checksum: Checksum = {
382382
let cache: Cache<MockApi, MockStorage, MockQuerier> =
383383
unsafe { Cache::new(options.clone()).unwrap() };
384-
cache.save_wasm(CYBERPUNK).unwrap()
384+
cache.store_code(CYBERPUNK, true, true).unwrap()
385385
};
386386

387387
group.bench_function("get instance from fs cache and execute", |b| {

packages/vm/examples/heap_profiling.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fn app(runtime: u64) {
119119

120120
let mut checksums = Vec::<Checksum>::new();
121121
for contract in &contracts {
122-
checksums.push(cache.save_wasm(contract.wasm).unwrap());
122+
checksums.push(cache.store_code(contract.wasm, true, true).unwrap());
123123
}
124124
checksums
125125
};

packages/vm/examples/multi_threaded_cache.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ const MEMORY_CACHE_SIZE: Size = Size::mebi(200);
2020

2121
static CONTRACT: &[u8] = include_bytes!("../testdata/hackatom.wasm");
2222

23-
const SAVE_WASM_THREADS: usize = 32;
23+
const STORE_CODE_THREADS: usize = 32;
2424
const INSTANTIATION_THREADS: usize = 2048;
25-
const THREADS: usize = SAVE_WASM_THREADS + INSTANTIATION_THREADS;
25+
const THREADS: usize = STORE_CODE_THREADS + INSTANTIATION_THREADS;
2626

2727
pub fn main() {
2828
let options = CacheOptions::new(
@@ -35,14 +35,14 @@ pub fn main() {
3535
let cache: Cache<MockApi, MockStorage, MockQuerier> = unsafe { Cache::new(options).unwrap() };
3636
let cache = Arc::new(cache);
3737

38-
let checksum = cache.save_wasm(CONTRACT).unwrap();
38+
let checksum = cache.store_code(CONTRACT, true, true).unwrap();
3939

4040
let mut threads = Vec::with_capacity(THREADS);
41-
for _ in 0..SAVE_WASM_THREADS {
41+
for _ in 0..STORE_CODE_THREADS {
4242
let cache = Arc::clone(&cache);
4343

4444
threads.push(thread::spawn(move || {
45-
let checksum = cache.save_wasm(CONTRACT).unwrap();
45+
let checksum = cache.store_code(CONTRACT, true, true).unwrap();
4646
println!("Done saving Wasm {checksum}");
4747
}));
4848
}

0 commit comments

Comments
 (0)