From 3316653b08d63d9f07a4b1e2f9e74f207dc37ecd Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Tue, 25 Jun 2024 18:14:37 +0200 Subject: [PATCH] Adjust cache size values --- internal/api/lib_test.go | 16 ++++++++-------- libwasmvm/src/cache.rs | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/internal/api/lib_test.go b/internal/api/lib_test.go index 78aaa7de..e0d29deb 100644 --- a/internal/api/lib_test.go +++ b/internal/api/lib_test.go @@ -305,7 +305,7 @@ func TestGetMetrics(t *testing.T) { require.Equal(t, uint32(0), metrics.HitsMemoryCache) require.Equal(t, uint32(1), metrics.HitsFsCache) require.Equal(t, uint64(1), metrics.ElementsMemoryCache) - require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25) + require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25) // Instantiate 2 msg2 := []byte(`{"verifier": "fred", "beneficiary": "susi"}`) @@ -318,7 +318,7 @@ func TestGetMetrics(t *testing.T) { require.Equal(t, uint32(1), metrics.HitsMemoryCache) require.Equal(t, uint32(1), metrics.HitsFsCache) require.Equal(t, uint64(1), metrics.ElementsMemoryCache) - require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25) + require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25) // Pin err = Pin(cache, checksum) @@ -331,8 +331,8 @@ func TestGetMetrics(t *testing.T) { require.Equal(t, uint32(2), metrics.HitsFsCache) require.Equal(t, uint64(1), metrics.ElementsPinnedMemoryCache) require.Equal(t, uint64(1), metrics.ElementsMemoryCache) - require.InEpsilon(t, 2832576, metrics.SizePinnedMemoryCache, 0.25) - require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25) + require.InEpsilon(t, 3700000, metrics.SizePinnedMemoryCache, 0.25) + require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25) // Instantiate 3 msg3 := []byte(`{"verifier": "fred", "beneficiary": "bert"}`) @@ -347,8 +347,8 @@ func TestGetMetrics(t *testing.T) { require.Equal(t, uint32(2), metrics.HitsFsCache) require.Equal(t, uint64(1), metrics.ElementsPinnedMemoryCache) require.Equal(t, uint64(1), metrics.ElementsMemoryCache) - require.InEpsilon(t, 2832576, metrics.SizePinnedMemoryCache, 0.25) - require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25) + require.InEpsilon(t, 3700000, metrics.SizePinnedMemoryCache, 0.25) + require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25) // Unpin err = Unpin(cache, checksum) @@ -363,7 +363,7 @@ func TestGetMetrics(t *testing.T) { require.Equal(t, uint64(0), metrics.ElementsPinnedMemoryCache) require.Equal(t, uint64(1), metrics.ElementsMemoryCache) require.Equal(t, uint64(0), metrics.SizePinnedMemoryCache) - require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25) + require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25) // Instantiate 4 msg4 := []byte(`{"verifier": "fred", "beneficiary": "jeff"}`) @@ -379,7 +379,7 @@ func TestGetMetrics(t *testing.T) { require.Equal(t, uint64(0), metrics.ElementsPinnedMemoryCache) require.Equal(t, uint64(1), metrics.ElementsMemoryCache) require.Equal(t, uint64(0), metrics.SizePinnedMemoryCache) - require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25) + require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25) } func TestInstantiate(t *testing.T) { diff --git a/libwasmvm/src/cache.rs b/libwasmvm/src/cache.rs index 9aeada1d..57590e73 100644 --- a/libwasmvm/src/cache.rs +++ b/libwasmvm/src/cache.rs @@ -763,6 +763,8 @@ mod tests { hackatom_report.required_capabilities.consume().unwrap(), b"" ); + assert_eq!(hackatom_report.contract_migrate_version.is_some, true); + assert_eq!(hackatom_report.contract_migrate_version.value, 42); let mut error_msg = UnmanagedVector::default(); let ibc_reflect_report = analyze_code(