Skip to content

Commit e8310e2

Browse files
chipshortchipshort
committed
Adjust cache size values
1 parent c0b5da6 commit e8310e2

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

‎internal/api/lib_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ func TestGetMetrics(t *testing.T) {
305305
require.Equal(t, uint32(0), metrics.HitsMemoryCache)
306306
require.Equal(t, uint32(1), metrics.HitsFsCache)
307307
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
308-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
308+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
309309

310310
// Instantiate 2
311311
msg2 := []byte(`{"verifier": "fred", "beneficiary": "susi"}`)
@@ -318,7 +318,7 @@ func TestGetMetrics(t *testing.T) {
318318
require.Equal(t, uint32(1), metrics.HitsMemoryCache)
319319
require.Equal(t, uint32(1), metrics.HitsFsCache)
320320
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
321-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
321+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
322322

323323
// Pin
324324
err = Pin(cache, checksum)
@@ -331,8 +331,8 @@ func TestGetMetrics(t *testing.T) {
331331
require.Equal(t, uint32(2), metrics.HitsFsCache)
332332
require.Equal(t, uint64(1), metrics.ElementsPinnedMemoryCache)
333333
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
334-
require.InEpsilon(t, 2832576, metrics.SizePinnedMemoryCache, 0.25)
335-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
334+
require.InEpsilon(t, 3700000, metrics.SizePinnedMemoryCache, 0.25)
335+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
336336

337337
// Instantiate 3
338338
msg3 := []byte(`{"verifier": "fred", "beneficiary": "bert"}`)
@@ -347,8 +347,8 @@ func TestGetMetrics(t *testing.T) {
347347
require.Equal(t, uint32(2), metrics.HitsFsCache)
348348
require.Equal(t, uint64(1), metrics.ElementsPinnedMemoryCache)
349349
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
350-
require.InEpsilon(t, 2832576, metrics.SizePinnedMemoryCache, 0.25)
351-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
350+
require.InEpsilon(t, 3700000, metrics.SizePinnedMemoryCache, 0.25)
351+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
352352

353353
// Unpin
354354
err = Unpin(cache, checksum)
@@ -363,7 +363,7 @@ func TestGetMetrics(t *testing.T) {
363363
require.Equal(t, uint64(0), metrics.ElementsPinnedMemoryCache)
364364
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
365365
require.Equal(t, uint64(0), metrics.SizePinnedMemoryCache)
366-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
366+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
367367

368368
// Instantiate 4
369369
msg4 := []byte(`{"verifier": "fred", "beneficiary": "jeff"}`)
@@ -379,7 +379,7 @@ func TestGetMetrics(t *testing.T) {
379379
require.Equal(t, uint64(0), metrics.ElementsPinnedMemoryCache)
380380
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
381381
require.Equal(t, uint64(0), metrics.SizePinnedMemoryCache)
382-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
382+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
383383
}
384384

385385
func TestInstantiate(t *testing.T) {

‎lib_libwasmvm_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func TestGetMetrics(t *testing.T) {
285285
require.Equal(t, uint32(1), metrics.HitsFsCache)
286286
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
287287
t.Log(metrics.SizeMemoryCache)
288-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
288+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
289289

290290
// Instantiate 2
291291
msg2 := []byte(`{"verifier": "fred", "beneficiary": "susi"}`)
@@ -301,7 +301,7 @@ func TestGetMetrics(t *testing.T) {
301301
require.Equal(t, uint32(1), metrics.HitsMemoryCache)
302302
require.Equal(t, uint32(1), metrics.HitsFsCache)
303303
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
304-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
304+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
305305

306306
// Pin
307307
err = vm.Pin(checksum)
@@ -314,8 +314,8 @@ func TestGetMetrics(t *testing.T) {
314314
require.Equal(t, uint32(2), metrics.HitsFsCache)
315315
require.Equal(t, uint64(1), metrics.ElementsPinnedMemoryCache)
316316
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
317-
require.InEpsilon(t, 2832576, metrics.SizePinnedMemoryCache, 0.25)
318-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
317+
require.InEpsilon(t, 3700000, metrics.SizePinnedMemoryCache, 0.25)
318+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
319319

320320
// Instantiate 3
321321
msg3 := []byte(`{"verifier": "fred", "beneficiary": "bert"}`)
@@ -333,8 +333,8 @@ func TestGetMetrics(t *testing.T) {
333333
require.Equal(t, uint32(2), metrics.HitsFsCache)
334334
require.Equal(t, uint64(1), metrics.ElementsPinnedMemoryCache)
335335
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
336-
require.InEpsilon(t, 2832576, metrics.SizePinnedMemoryCache, 0.25)
337-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
336+
require.InEpsilon(t, 3700000, metrics.SizePinnedMemoryCache, 0.25)
337+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
338338

339339
// Unpin
340340
err = vm.Unpin(checksum)
@@ -349,7 +349,7 @@ func TestGetMetrics(t *testing.T) {
349349
require.Equal(t, uint64(0), metrics.ElementsPinnedMemoryCache)
350350
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
351351
require.Equal(t, uint64(0), metrics.SizePinnedMemoryCache)
352-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
352+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
353353

354354
// Instantiate 4
355355
msg4 := []byte(`{"verifier": "fred", "beneficiary": "jeff"}`)
@@ -368,7 +368,7 @@ func TestGetMetrics(t *testing.T) {
368368
require.Equal(t, uint64(0), metrics.ElementsPinnedMemoryCache)
369369
require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
370370
require.Equal(t, uint64(0), metrics.SizePinnedMemoryCache)
371-
require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
371+
require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
372372
}
373373

374374
func TestLongPayloadDeserialization(t *testing.T) {

‎libwasmvm/src/cache.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ mod tests {
763763
hackatom_report.required_capabilities.consume().unwrap(),
764764
b""
765765
);
766+
assert_eq!(hackatom_report.contract_migrate_version.is_some, true);
767+
assert_eq!(hackatom_report.contract_migrate_version.value, 42);
766768

767769
let mut error_msg = UnmanagedVector::default();
768770
let ibc_reflect_report = analyze_code(

0 commit comments

Comments
 (0)