From 19b980f7bfa315ae01afacb96f1bb76873270b53 Mon Sep 17 00:00:00 2001 From: wanderer Date: Mon, 5 Mar 2018 23:59:05 -0500 Subject: [PATCH] fix merge Signed-off-by: wanderer --- tests/wasmContainer.js | 26 +------------------------- wasmContainer.js | 2 +- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/tests/wasmContainer.js b/tests/wasmContainer.js index 6597d90..6af3ac0 100644 --- a/tests/wasmContainer.js +++ b/tests/wasmContainer.js @@ -67,7 +67,7 @@ tape('empty', async t => { t.plan(1) tester = t const expectedState = { - '/': Buffer.from('a2440f97e233b183f5e66fb6d60765311be7a2b7', 'hex') + '/': Buffer.from('bda5092c441e8d40c32eeeb69ce0e493f9d487cb', 'hex') } const tree = new RadixTree({ @@ -280,27 +280,3 @@ tape('load / store globals', async t => { hypervisor.send(message) }) }) - -tape('ben', async t => { - // t.plan(1) - tester = t - const tree = new RadixTree({ - db - }) - - const wasm = fs.readFileSync(WASM_PATH + '.wasm') - const hypervisor = new Hypervisor(tree) - hypervisor.registerContainer(TestWasmContainer) - - const {module} = await hypervisor.createActor(TestWasmContainer.typeId, wasm) - - const funcRef = module.getFuncRef('#main') - funcRef.gas = 100000 - - const message = new Message({ - funcRef - }).on('done', () => { - t.end() - }) - hypervisor.send(message) -}) diff --git a/wasmContainer.js b/wasmContainer.js index 3ee0cde..751b859 100644 --- a/wasmContainer.js +++ b/wasmContainer.js @@ -156,7 +156,7 @@ module.exports = class WasmContainer { }, export: (modRef, bufRef) => { const mod = this.refs.get(modRef, 'mod') - let name = this.get8Memory(offset, length) + let name = this.refs.get(bufRef, 'buf') name = Buffer.from(name).toString() const funcRef = mod.getFuncRef(name) return this.refs.add(funcRef, 'func')