mleku/wazero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Support registering multiple instances of anonymous modules (#1259)

Browse Source 
Signed-off-by: Achille Roussel <achille.roussel@gmail.com>
Signed-off-by: Clifton Kaznocha <ckaznocha@users.noreply.github.com>
Co-authored-by: Clifton Kaznocha <ckaznocha@users.noreply.github.com>
This commit is contained in:
Achille
2023-03-23 10:27:19 -07:00
committed by GitHub
parent 53bb95eeaa
commit 4eba21372c
6 changed files with 89 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/wasm/store_module_list_test.go
View File

@@ -52,7 +52,7 @@ func TestStore_deleteModule(t *testing.T) {
s, m1, m2 := newTestStore()
t.Run("delete one module", func(t *testing.T) {
require.NoError(t, s.deleteModule(m2.Name))
require.NoError(t, s.deleteModule(m2.moduleListNode))
// Leaves the other module alone
m1Node := &moduleListNode{name: m1.Name, module: m1}
@@ -61,11 +61,11 @@ func TestStore_deleteModule(t *testing.T) {
})
t.Run("ok if missing", func(t *testing.T) {
require.NoError(t, s.deleteModule(m2.Name))
require.NoError(t, s.deleteModule(m2.moduleListNode))
})
t.Run("delete last module", func(t *testing.T) {
require.NoError(t, s.deleteModule(m1.Name))
require.NoError(t, s.deleteModule(m1.moduleListNode))
require.Zero(t, len(s.nameToNode))
require.Nil(t, s.moduleList)
@@ -129,7 +129,7 @@ func TestStore_requireModuleName(t *testing.T) {
s := newStore()
t.Run("first", func(t *testing.T) {
err := s.requireModuleName("m1")
_, err := s.requireModuleName("m1")
require.NoError(t, err)
// Ensure it adds the module name, and doesn't impact the module list.
@@ -137,7 +137,7 @@ func TestStore_requireModuleName(t *testing.T) {
require.Equal(t, map[string]*moduleListNode{"m1": {name: "m1"}}, s.nameToNode)
})
t.Run("second", func(t *testing.T) {
err := s.requireModuleName("m2")
_, err := s.requireModuleName("m2")
require.NoError(t, err)
m2Node := &moduleListNode{name: "m2"}
m1Node := &moduleListNode{name: "m1", prev: m2Node}
@@ -148,7 +148,7 @@ func TestStore_requireModuleName(t *testing.T) {
require.Equal(t, map[string]*moduleListNode{"m1": m1Node, "m2": m2Node}, s.nameToNode)
})
t.Run("existing", func(t *testing.T) {
err := s.requireModuleName("m2")
_, err := s.requireModuleName("m2")
require.EqualError(t, err, "module[m2] has already been instantiated")
})
}
@@ -194,5 +194,8 @@ func newTestStore() (*Store, *ModuleInstance, *ModuleInstance) {
node1.prev = node2
s.nameToNode = map[string]*moduleListNode{m1.Name: node1, m2.Name: node2}
s.moduleList = node2
m1.moduleListNode = node1
m2.moduleListNode = node2
return s, m1, m2
}