reuse metadata helper

LimeChain · Jan 15, 2024 · a411322 · a411322
1 parent fd288ff
commit a411322
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 37 deletions.
diff --git a/gossamer b/gossamer
diff --git a/runtime/benchmark_runtime_test.go b/runtime/benchmark_runtime_test.go
diff --git a/runtime/benchmark_timestamp_set_test.go b/runtime/benchmark_timestamp_set_test.go
@@ -21,7 +21,7 @@ func BenchmarkTimestampSetStep1(b *testing.B) {
 func benchmarkTimestampSet(b *testing.B) {
 	rt, storage := newBenchmarkingRuntime(b)
 
-	metadata := newBenchmarkingRuntimeMetadata(b, rt)
+	metadata := runtimeMetadata(b, rt)
 
 	// Setup the input params
 	now := uint64(time.Now().UnixMilli())

diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go
@@ -123,7 +123,12 @@ func newTestRuntime(t *testing.T) (*wazero_runtime.Instance, *runtime.Storage) {
 	return runtime, &runtime.Context.Storage
 }
 
-func runtimeMetadata(t *testing.T, instance *wazero_runtime.Instance) *ctypes.Metadata {
+func newBenchmarkingRuntime(b *testing.B) (*wazero_runtime.Instance, *runtime.Storage) {
+	runtime := wazero_runtime.NewBenchInstanceWithTrie(b, WASM_RUNTIME, trie.NewEmptyTrie())
+	return runtime, &runtime.Context.Storage
+}
+
+func runtimeMetadata(t assert.TestingT, instance *wazero_runtime.Instance) *ctypes.Metadata {
 	bMetadata, err := instance.Metadata()
 	assert.NoError(t, err)
 

diff --git a/tinygo b/tinygo
+4 −2		lib/runtime/interfaces.go
+26 −14		lib/runtime/storage/trie.go
+18 −0		lib/runtime/wazero/imports.go
+10 −4		lib/runtime/wazero/instance.go
+1 −0		builder/build.go
+2 −1		src/runtime/gc_debug.go
+1 −4		src/runtime/runtime_polkawasm.go