Minor code cleanup and add test to load module from embedded resource.

A minor cleanup to the new overloads of `LoadModule` and `LoadModuleText`.

Added test cases to cover loading a module from an embedded resource stream.

Author: Peter Huene

src/Host.cs

@@ -2,9 +2,6 @@
 using System.IO;
 using System.Text;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
 
 namespace Wasmtime
 {
@@ -596,16 +593,26 @@ public Module LoadModule(string path)
         }
 
         /// <summary>
-        /// Loads a <see cref="Module"/> given stream as WebAssembly.
+        /// Loads a <see cref="Module"/> given a stream.
         /// </summary>
-        /// <param name="moduleName">Name of the module</param>
-        /// <param name="stream">Stream with module data</param>
+        /// <param name="name">The name of the module.</param>
+        /// <param name="stream">The stream of the module data.</param>
         /// <returns>Returns a new <see cref="Module"/>.</returns>
-        public Module LoadModule(string moduleName, Stream moduleStream)
+        public Module LoadModule(string name, Stream stream)
         {
-            byte[] byteArray = new byte[moduleStream.Length];
-            moduleStream.Read(byteArray);
-            return LoadModule(moduleName, byteArray);
+            if (string.IsNullOrEmpty(name))
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (stream is null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            using var ms = new MemoryStream();
+            stream.CopyTo(ms);
+            return LoadModule(name, ms.ToArray());
         }
 
         /// <summary>
@@ -664,14 +671,23 @@ public Module LoadModuleText(string path)
         /// <summary>
         /// Loads a <see cref="Module"/> given stream as WebAssembly text format stream.
         /// </summary>
-        /// <param name="moduleName">Name of the module</param>
-        /// <param name="stream">WebAssembly text format stream with module data</param>
+        /// <param name="name">The name of the module.</param>
+        /// <param name="stream">The stream of the module data.</param>
         /// <returns>Returns a new <see cref="Module"/>.</returns>
-        public Module LoadModuleText(string moduleName, Stream moduleStream)
+        public Module LoadModuleText(string name, Stream stream)
         {
-            byte[] byteArray = new byte[moduleStream.Length];
-            moduleStream.Read(byteArray);
-            return LoadModuleText(moduleName, Encoding.UTF8.GetString(byteArray, 0, byteArray.Length));
+            if (string.IsNullOrEmpty(name))
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (stream is null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            using var reader = new StreamReader(stream);
+            return LoadModuleText(name, reader.ReadToEnd());
         }
 
         /// <summary>

tests/Fixtures/ModuleFixture.cs

@@ -13,12 +13,7 @@ public ModuleFixture()
                 .WithReferenceTypes(true)
                 .Build();
 
-            var modulePath = Path.Combine("Modules", ModuleFileName);
-            Module = Host.LoadModuleText(modulePath);
-            using (FileStream fs = File.OpenRead(modulePath))
-            {
-                StreamModule = Host.LoadModuleText(modulePath, fs);
-            }
+            Module = Host.LoadModuleText(Path.Combine("Modules", ModuleFileName));
         }
 
         public void Dispose()
@@ -29,12 +24,6 @@ public void Dispose()
                 Module = null;
             }
 
-            if (!(StreamModule is null))
-            {
-                StreamModule.Dispose();
-                StreamModule = null;
-            }
-            
             if (!(Host is null))
             {
                 Host.Dispose();
@@ -44,7 +33,6 @@ public void Dispose()
 
         public Host Host { get; set; }
         public Module Module { get; set; }
-        public Module StreamModule { get; set; }
 
         protected abstract string ModuleFileName { get; }
     }

tests/ModuleLoadTests.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Reflection;
+using FluentAssertions;
+using Wasmtime;
+using Xunit;
+
+namespace Wasmtime.Tests
+{
+    public class ModuleLoadTests
+    {
+        [Fact]
+        public void ItLoadsModuleFromEmbeddedResource()
+        {
+            using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("hello.wasm");
+            stream.Should().NotBeNull();
+
+            using var host = new Host();
+            host.LoadModule("hello.wasm", stream).Should().NotBeNull();
+        }
+
+        [Fact]
+        public void ItLoadsModuleTextFromEmbeddedResource()
+        {
+            using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("hello.wat");
+            stream.Should().NotBeNull();
+
+            using var host = new Host();
+            host.LoadModuleText("hello.wat", stream).Should().NotBeNull();
+        }
+    }
+}

tests/Modules/hello.wasm

@@ -0,0 +1,8 @@
+(module
+  (type $t0 (func))
+  (import "" "hello" (func $.hello (type $t0)))
+  (func $run
+    call $.hello
+  )
+  (export "run" (func $run))
+)

tests/Modules/hello.wat

@@ -19,7 +19,8 @@
 
   <ItemGroup>
     <None Update="Modules/*.wat" CopyToOutputDirectory="PreserveNewest" />
-<!--    <EmbeddedResource Update="Modules/*.wat" />-->
+    <EmbeddedResource Include="Modules/hello.wat" LogicalName="hello.wat" />
+    <EmbeddedResource Include="Modules/hello.wasm" LogicalName="hello.wasm" />
   </ItemGroup>
-  
+
 </Project>