Adjust cache size values

CosmWasm · Jun 25, 2024 · e8310e2 · e8310e2
1 parent c0b5da6
commit e8310e2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git 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/lib_libwasmvm_test.go b/lib_libwasmvm_test.go
@@ -285,7 +285,7 @@ func TestGetMetrics(t *testing.T) {
 	require.Equal(t, uint32(1), metrics.HitsFsCache)
 	require.Equal(t, uint64(1), metrics.ElementsMemoryCache)
 	t.Log(metrics.SizeMemoryCache)
-	require.InEpsilon(t, 2832576, metrics.SizeMemoryCache, 0.25)
+	require.InEpsilon(t, 3700000, metrics.SizeMemoryCache, 0.25)
 
 	// Instantiate 2
 	msg2 := []byte(`{"verifier": "fred", "beneficiary": "susi"}`)
@@ -301,7 +301,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 = vm.Pin(checksum)
@@ -314,8 +314,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"}`)
@@ -333,8 +333,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 = vm.Unpin(checksum)
@@ -349,7 +349,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"}`)
@@ -368,7 +368,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 TestLongPayloadDeserialization(t *testing.T) {

diff --git 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(