Commit b5cb4112bbeaaa34f0d5faa38670426dc58971bf
remove codehandler
wanderer committed on 4/26/2017, 10:31:28 AMParent: 50a0ebc04208fbb22e6da71e180399a8fc00b3a3
Files changed
| tests/index.js | changed |
| codeHandler.js | deleted |
| tests/index.js | ||
|---|---|---|
| @@ -35,25 +35,20 @@ | ||
| 35 | 35 | t.true(m === message, 'should recive a message') |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - try { | |
| 40 | - const hypervisor = new Hypervisor({ | |
| 41 | - dag: node.dag | |
| 42 | - }) | |
| 43 | - hypervisor.addVM('test', testVMContainer) | |
| 39 | + const hypervisor = new Hypervisor({ | |
| 40 | + dag: node.dag | |
| 41 | + }) | |
| 42 | + hypervisor.addVM('test', testVMContainer) | |
| 44 | 43 | |
| 45 | - await hypervisor.send(state, message) | |
| 46 | - await hypervisor.createStateRoot(state, Infinity) | |
| 47 | - console.log('state root') | |
| 48 | - t.deepEquals(state, expectedState, 'expected') | |
| 49 | - t.end() | |
| 50 | - } catch (e) { | |
| 51 | - console.log(e) | |
| 52 | - } | |
| 44 | + await hypervisor.send(state, message) | |
| 45 | + await hypervisor.createStateRoot(state, Infinity) | |
| 46 | + t.deepEquals(state, expectedState, 'expected') | |
| 47 | + t.end() | |
| 53 | 48 | }) |
| 54 | 49 | |
| 55 | - tape('one child contract', t => { | |
| 50 | + tape('one child contract', async t => { | |
| 56 | 51 | t.end() |
| 57 | 52 | node.stop(() => { |
| 58 | 53 | process.exit() |
| 59 | 54 | }) |
| @@ -64,28 +59,46 @@ | ||
| 64 | 59 | this.kernel = kernel |
| 65 | 60 | } |
| 66 | 61 | |
| 67 | 62 | run (m) { |
| 68 | - | |
| 63 | + this.kernel.ports.create('child', 'test2', null) | |
| 64 | + this.kernek.send('child', m) | |
| 69 | 65 | } |
| 70 | 66 | } |
| 71 | 67 | |
| 72 | - // const state = { | |
| 73 | - // id: {}, | |
| 74 | - // ports: { | |
| 75 | - // first: { | |
| 76 | - // id: { | |
| 77 | - // nonce: 1, | |
| 78 | - // parent: 'hash' | |
| 79 | - // }, | |
| 80 | - // code: 'js code', | |
| 81 | - // type: 'test', | |
| 82 | - // ports: { | |
| 68 | + class testVMContainer2 { | |
| 69 | + run (m) { | |
| 70 | + t.true(m === message, 'should recive a message') | |
| 71 | + } | |
| 72 | + } | |
| 83 | 73 | |
| 84 | - // } | |
| 85 | - // } | |
| 86 | - // } | |
| 87 | - // } | |
| 74 | + const state = { | |
| 75 | + messages: [], | |
| 76 | + id: { | |
| 77 | + '/': { | |
| 78 | + nonce: new Buffer([0]), | |
| 79 | + parent: { | |
| 80 | + '/': null | |
| 81 | + } | |
| 82 | + } | |
| 83 | + }, | |
| 84 | + type: 'test', | |
| 85 | + vm: { | |
| 86 | + '/': { | |
| 87 | + ports: {} | |
| 88 | + } | |
| 89 | + } | |
| 90 | + } | |
| 91 | + | |
| 92 | + const hypervisor = new Hypervisor({ | |
| 93 | + dag: node.dag | |
| 94 | + }) | |
| 95 | + hypervisor.addVM('test', testVMContainer) | |
| 96 | + | |
| 97 | + await hypervisor.send(state, message) | |
| 98 | + await hypervisor.createStateRoot(state, Infinity) | |
| 99 | + t.deepEquals(state, expectedState, 'expected') | |
| 100 | + t.end() | |
| 88 | 101 | // const message = new Message({ |
| 89 | 102 | // type: 'create', |
| 90 | 103 | // path: 'first', |
| 91 | 104 | // data: jsCode |
| codeHandler.js | ||
|---|---|---|
| @@ -1,48 +1,0 @@ | ||
| 1 | -const Wasm = require('primea-wasm-container') | |
| 2 | - | |
| 3 | -const defaultHandler = { | |
| 4 | - test: (state) => { | |
| 5 | - return !state.code | |
| 6 | - }, | |
| 7 | - init: () => { | |
| 8 | - return require('./defaultAgent.js') | |
| 9 | - } | |
| 10 | -} | |
| 11 | - | |
| 12 | -const wasm = { | |
| 13 | - test: (state) => { | |
| 14 | - const code = Buffer.from(state.code) | |
| 15 | - return code && code.slice(0, 4).toString() === '\x00asm' | |
| 16 | - }, | |
| 17 | - init: (code) => { | |
| 18 | - return new Wasm(code) | |
| 19 | - } | |
| 20 | -} | |
| 21 | - | |
| 22 | -const javascript = { | |
| 23 | - test: (state) => { | |
| 24 | - return typeof state.code === 'function' | |
| 25 | - }, | |
| 26 | - init: (state) => { | |
| 27 | - return { | |
| 28 | - run: state.code | |
| 29 | - } | |
| 30 | - } | |
| 31 | -} | |
| 32 | - | |
| 33 | -let codeHandlers = exports.handlers = { | |
| 34 | - default: defaultHandler, | |
| 35 | - wasm: wasm, | |
| 36 | - javascript: javascript | |
| 37 | -} | |
| 38 | - | |
| 39 | -exports.init = (code) => { | |
| 40 | - for (let name in codeHandlers) { | |
| 41 | - try { | |
| 42 | - const handler = codeHandlers[name] | |
| 43 | - if (handler.test(code)) { | |
| 44 | - return handler.init(code) | |
| 45 | - } | |
| 46 | - } catch (e) {} | |
| 47 | - } | |
| 48 | -} | |
Built with git-ssb-web