Upgrade Cosmwasm to v1.0.0-beta6 and adapt tests

CosmWasm · Mar 7, 2022 · d110799 · d110799
1 parent 2fce167
commit d110799
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 27 deletions.
diff --git a/api/lib_test.go b/api/lib_test.go
@@ -208,7 +208,7 @@ func TestGetMetrics(t *testing.T) {
 	assert.Equal(t, &types.Metrics{
 		HitsFsCache:         1,
 		ElementsMemoryCache: 1,
-		SizeMemoryCache:     5563894,
+		SizeMemoryCache:     5622877,
 	}, metrics)
 
 	// Instantiate 2
@@ -223,7 +223,7 @@ func TestGetMetrics(t *testing.T) {
 		HitsMemoryCache:     1,
 		HitsFsCache:         1,
 		ElementsMemoryCache: 1,
-		SizeMemoryCache:     5563894,
+		SizeMemoryCache:     5622877,
 	}, metrics)
 
 	// Pin
@@ -238,8 +238,8 @@ func TestGetMetrics(t *testing.T) {
 		HitsFsCache:               1,
 		ElementsPinnedMemoryCache: 1,
 		ElementsMemoryCache:       1,
-		SizePinnedMemoryCache:     5563894,
-		SizeMemoryCache:           5563894,
+		SizePinnedMemoryCache:     5622877,
+		SizeMemoryCache:           5622877,
 	}, metrics)
 
 	// Instantiate 3
@@ -256,8 +256,8 @@ func TestGetMetrics(t *testing.T) {
 		HitsFsCache:               1,
 		ElementsPinnedMemoryCache: 1,
 		ElementsMemoryCache:       1,
-		SizePinnedMemoryCache:     5563894,
-		SizeMemoryCache:           5563894,
+		SizePinnedMemoryCache:     5622877,
+		SizeMemoryCache:           5622877,
 	}, metrics)
 
 	// Unpin
@@ -274,7 +274,7 @@ func TestGetMetrics(t *testing.T) {
 		ElementsPinnedMemoryCache: 0,
 		ElementsMemoryCache:       1,
 		SizePinnedMemoryCache:     0,
-		SizeMemoryCache:           5563894,
+		SizeMemoryCache:           5622877,
 	}, metrics)
 
 	// Instantiate 4
@@ -292,7 +292,7 @@ func TestGetMetrics(t *testing.T) {
 		ElementsPinnedMemoryCache: 0,
 		ElementsMemoryCache:       1,
 		SizePinnedMemoryCache:     0,
-		SizeMemoryCache:           5563894,
+		SizeMemoryCache:           5622877,
 	}, metrics)
 }
 

diff --git a/api/testdata/hackatom.wasm b/api/testdata/hackatom.wasm
diff --git a/api/testdata/ibc_reflect.wasm b/api/testdata/ibc_reflect.wasm
diff --git a/api/testdata/queue.wasm b/api/testdata/queue.wasm
diff --git a/api/testdata/reflect.wasm b/api/testdata/reflect.wasm
diff --git a/lib_test.go b/lib_test.go
@@ -133,7 +133,7 @@ func TestGetMetrics(t *testing.T) {
 	assert.Equal(t, &types.Metrics{
 		HitsFsCache:         1,
 		ElementsMemoryCache: 1,
-		SizeMemoryCache:     5563894,
+		SizeMemoryCache:     5622877,
 	}, metrics)
 
 	// Instantiate 2
@@ -149,7 +149,7 @@ func TestGetMetrics(t *testing.T) {
 		HitsMemoryCache:     1,
 		HitsFsCache:         1,
 		ElementsMemoryCache: 1,
-		SizeMemoryCache:     5563894,
+		SizeMemoryCache:     5622877,
 	}, metrics)
 
 	// Pin
@@ -164,8 +164,8 @@ func TestGetMetrics(t *testing.T) {
 		HitsFsCache:               1,
 		ElementsPinnedMemoryCache: 1,
 		ElementsMemoryCache:       1,
-		SizePinnedMemoryCache:     5563894,
-		SizeMemoryCache:           5563894,
+		SizePinnedMemoryCache:     5622877,
+		SizeMemoryCache:           5622877,
 	}, metrics)
 
 	// Instantiate 3
@@ -183,8 +183,8 @@ func TestGetMetrics(t *testing.T) {
 		HitsFsCache:               1,
 		ElementsPinnedMemoryCache: 1,
 		ElementsMemoryCache:       1,
-		SizePinnedMemoryCache:     5563894,
-		SizeMemoryCache:           5563894,
+		SizePinnedMemoryCache:     5622877,
+		SizeMemoryCache:           5622877,
 	}, metrics)
 
 	// Unpin
@@ -201,7 +201,7 @@ func TestGetMetrics(t *testing.T) {
 		ElementsPinnedMemoryCache: 0,
 		ElementsMemoryCache:       1,
 		SizePinnedMemoryCache:     0,
-		SizeMemoryCache:           5563894,
+		SizeMemoryCache:           5622877,
 	}, metrics)
 
 	// Instantiate 4
@@ -220,6 +220,6 @@ func TestGetMetrics(t *testing.T) {
 		ElementsPinnedMemoryCache: 0,
 		ElementsMemoryCache:       1,
 		SizePinnedMemoryCache:     0,
-		SizeMemoryCache:           5563894,
+		SizeMemoryCache:           5622877,
 	}, metrics)
 }
diff --git a/libwasmvm/Cargo.lock b/libwasmvm/Cargo.lock
diff --git a/libwasmvm/Cargo.toml b/libwasmvm/Cargo.toml
@@ -26,8 +26,8 @@ default = []
 backtraces = []
 
 [dependencies]
-cosmwasm-std = { git = "https://github.com/CosmWasm/cosmwasm.git", rev = "ec8b568e8", features = ["staking", "stargate", "iterator"] }
-cosmwasm-vm = { git = "https://github.com/CosmWasm/cosmwasm.git", rev = "ec8b568e8", features = ["staking", "stargate", "iterator"] }
+cosmwasm-std = { git = "https://github.com/CosmWasm/cosmwasm.git", rev = "v1.0.0-beta6", features = ["staking", "stargate", "iterator"] }
+cosmwasm-vm = { git = "https://github.com/CosmWasm/cosmwasm.git", rev = "v1.0.0-beta6", features = ["staking", "stargate", "iterator"] }
 errno = "0.2"
 serde_json = "1.0"
 thiserror = "1.0"

diff --git a/libwasmvm/src/cache.rs b/libwasmvm/src/cache.rs
@@ -702,7 +702,7 @@ mod tests {
                 misses: 0,
                 elements_pinned_memory_cache: 1,
                 elements_memory_cache: 0,
-                size_pinned_memory_cache: 5563894,
+                size_pinned_memory_cache: 5622877,
                 size_memory_cache: 0,
             }
         );