Skip to content

Commit fd1533e

Browse files
chipshortchipshort
authored
Merge pull request #2282 from CosmWasm/co/wasm-limits-renaming
Add unit to config field names
2 parents be905f3 + 3fe7015 commit fd1533e

File tree

5 files changed

+37
-35
lines changed

5 files changed

+37
-35
lines changed

‎packages/check/tests/cosmwasm_check_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fn wasm_limits_string_check() -> Result<(), Box<dyn std::error::Error>> {
103103
let mut cmd = Command::cargo_bin("cosmwasm-check")?;
104104

105105
let mut limits = WasmLimits::default();
106-
limits.initial_memory_limit = Some(10);
106+
limits.initial_memory_limit_pages = Some(10);
107107

108108
cmd.arg("--wasm-limits")
109109
.arg(to_json_string(&limits).unwrap())

‎packages/vm/benches/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ fn bench_combined(c: &mut Criterion) {
386386

387387
group.bench_function("get instance from fs cache and execute", |b| {
388388
let mut non_memcache = options.clone();
389-
non_memcache.memory_cache_size = Size::kibi(0);
389+
non_memcache.memory_cache_size_bytes = Size::kibi(0);
390390

391391
let cache: Cache<MockApi, MockStorage, MockQuerier> =
392392
unsafe { Cache::new(non_memcache).unwrap() };

‎packages/vm/src/cache.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ where
142142
CacheOptions {
143143
base_dir,
144144
available_capabilities,
145-
memory_cache_size,
146-
instance_memory_limit,
145+
memory_cache_size_bytes,
146+
instance_memory_limit_bytes,
147147
},
148148
wasm_limits,
149149
} = config;
@@ -165,11 +165,11 @@ where
165165
inner: Mutex::new(CacheInner {
166166
wasm_path,
167167
pinned_memory_cache: PinnedMemoryCache::new(),
168-
memory_cache: InMemoryCache::new(memory_cache_size),
168+
memory_cache: InMemoryCache::new(memory_cache_size_bytes),
169169
fs_cache,
170170
stats: Stats::default(),
171171
}),
172-
instance_memory_limit,
172+
instance_memory_limit: instance_memory_limit_bytes,
173173
type_storage: PhantomData::<S>,
174174
type_api: PhantomData::<A>,
175175
type_querier: PhantomData::<Q>,
@@ -614,8 +614,8 @@ mod tests {
614614
CacheOptions {
615615
base_dir: TempDir::new().unwrap().into_path(),
616616
available_capabilities: default_capabilities(),
617-
memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
618-
instance_memory_limit: TESTING_MEMORY_LIMIT,
617+
memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
618+
instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
619619
}
620620
}
621621

@@ -625,8 +625,8 @@ mod tests {
625625
CacheOptions {
626626
base_dir: TempDir::new().unwrap().into_path(),
627627
available_capabilities: capabilities,
628-
memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
629-
instance_memory_limit: TESTING_MEMORY_LIMIT,
628+
memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
629+
instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
630630
}
631631
}
632632

@@ -755,8 +755,8 @@ mod tests {
755755
let options1 = CacheOptions {
756756
base_dir: tmp_dir.path().to_path_buf(),
757757
available_capabilities: default_capabilities(),
758-
memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
759-
instance_memory_limit: TESTING_MEMORY_LIMIT,
758+
memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
759+
instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
760760
};
761761
let cache1: Cache<MockApi, MockStorage, MockQuerier> =
762762
unsafe { Cache::new(options1).unwrap() };
@@ -767,8 +767,8 @@ mod tests {
767767
let options2 = CacheOptions {
768768
base_dir: tmp_dir.path().to_path_buf(),
769769
available_capabilities: default_capabilities(),
770-
memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
771-
instance_memory_limit: TESTING_MEMORY_LIMIT,
770+
memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
771+
instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
772772
};
773773
let cache2: Cache<MockApi, MockStorage, MockQuerier> =
774774
unsafe { Cache::new(options2).unwrap() };
@@ -800,8 +800,8 @@ mod tests {
800800
let options = CacheOptions {
801801
base_dir: tmp_dir.path().to_path_buf(),
802802
available_capabilities: default_capabilities(),
803-
memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
804-
instance_memory_limit: TESTING_MEMORY_LIMIT,
803+
memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
804+
instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
805805
};
806806
let cache: Cache<MockApi, MockStorage, MockQuerier> =
807807
unsafe { Cache::new(options).unwrap() };
@@ -1606,8 +1606,8 @@ mod tests {
16061606
let options = CacheOptions {
16071607
base_dir: tmp_dir.path().to_path_buf(),
16081608
available_capabilities: default_capabilities(),
1609-
memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
1610-
instance_memory_limit: TESTING_MEMORY_LIMIT,
1609+
memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
1610+
instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
16111611
};
16121612
let cache: Cache<MockApi, MockStorage, MockQuerier> =
16131613
unsafe { Cache::new(options).unwrap() };
@@ -1639,8 +1639,8 @@ mod tests {
16391639
cache: CacheOptions {
16401640
base_dir: tmp_dir.path().to_path_buf(),
16411641
available_capabilities: default_capabilities(),
1642-
memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
1643-
instance_memory_limit: TESTING_MEMORY_LIMIT,
1642+
memory_cache_size_bytes: TESTING_MEMORY_CACHE_SIZE,
1643+
instance_memory_limit_bytes: TESTING_MEMORY_LIMIT,
16441644
},
16451645
};
16461646

‎packages/vm/src/compatibility.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ fn check_wasm_tables(module: &ParsedWasm, wasm_limits: &WasmLimits) -> VmResult<
122122
1 => {
123123
let limits = &module.tables[0];
124124
if let Some(maximum) = limits.maximum {
125-
if maximum > wasm_limits.table_size_limit() {
125+
if maximum > wasm_limits.table_size_limit_elements() {
126126
return Err(VmError::static_validation_err(
127127
"Wasm contract's first table section has a too large max limit",
128128
));
@@ -148,10 +148,10 @@ fn check_wasm_memories(module: &ParsedWasm, limits: &WasmLimits) -> VmResult<()>
148148
}
149149
let memory = &module.memories[0];
150150

151-
if memory.initial > limits.initial_memory_limit() as u64 {
151+
if memory.initial > limits.initial_memory_limit_pages() as u64 {
152152
return Err(VmError::static_validation_err(format!(
153153
"Wasm contract memory's minimum must not exceed {} pages.",
154-
limits.initial_memory_limit()
154+
limits.initial_memory_limit_pages()
155155
)));
156156
}
157157

‎packages/vm/src/config.rs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pub struct WasmLimits {
5252
///
5353
/// Every Wasm memory has an initial size and an optional maximum size,
5454
/// both measured in Wasm pages. This limit applies to the initial size.
55-
pub initial_memory_limit: Option<u32>,
55+
pub initial_memory_limit_pages: Option<u32>,
5656
/// The upper limit for the `max` value of each table. CosmWasm contracts have
5757
/// initial=max for 1 table. See
5858
///
@@ -64,7 +64,7 @@ pub struct WasmLimits {
6464
/// - table[0] type=funcref initial=161 max=161
6565
/// ```
6666
///
67-
pub table_size_limit: Option<u32>,
67+
pub table_size_limit_elements: Option<u32>,
6868
/// If the contract has more than this amount of imports, it will be rejected
6969
/// during static validation before even looking into the imports.
7070
pub max_imports: Option<usize>,
@@ -88,12 +88,14 @@ pub struct WasmLimits {
8888
}
8989

9090
impl WasmLimits {
91-
pub fn initial_memory_limit(&self) -> u32 {
92-
self.initial_memory_limit.unwrap_or(DEFAULT_MEMORY_LIMIT)
91+
pub fn initial_memory_limit_pages(&self) -> u32 {
92+
self.initial_memory_limit_pages
93+
.unwrap_or(DEFAULT_MEMORY_LIMIT)
9394
}
9495

95-
pub fn table_size_limit(&self) -> u32 {
96-
self.table_size_limit.unwrap_or(DEFAULT_TABLE_SIZE_LIMIT)
96+
pub fn table_size_limit_elements(&self) -> u32 {
97+
self.table_size_limit_elements
98+
.unwrap_or(DEFAULT_TABLE_SIZE_LIMIT)
9799
}
98100

99101
pub fn max_imports(&self) -> usize {
@@ -130,24 +132,24 @@ pub struct CacheOptions {
130132
pub base_dir: PathBuf,
131133
pub available_capabilities: HashSet<String>,
132134
/// Memory limit for the cache, in bytes.
133-
pub memory_cache_size: Size,
135+
pub memory_cache_size_bytes: Size,
134136
/// Memory limit for instances, in bytes. Use a value that is divisible by the Wasm page size 65536,
135137
/// e.g. full MiBs.
136-
pub instance_memory_limit: Size,
138+
pub instance_memory_limit_bytes: Size,
137139
}
138140

139141
impl CacheOptions {
140142
pub fn new(
141143
base_dir: impl Into<PathBuf>,
142144
available_capabilities: impl Into<HashSet<String>>,
143-
memory_cache_size: Size,
144-
instance_memory_limit: Size,
145+
memory_cache_size_bytes: Size,
146+
instance_memory_limit_bytes: Size,
145147
) -> Self {
146148
Self {
147149
base_dir: base_dir.into(),
148150
available_capabilities: available_capabilities.into(),
149-
memory_cache_size,
150-
instance_memory_limit,
151+
memory_cache_size_bytes,
152+
instance_memory_limit_bytes,
151153
}
152154
}
153155
}

0 commit comments

Comments
 (0)