c19fb7a3ce
Conflicts: Script.js ScriptInterpreter.js Transaction.js test/testdata.js ...conflicts resolved by taking Manuel's changes, and then manually including Matias's changes on those same files. The conflicts resulted from differences in indentation, which is because Matias' changes unindendented all the code that had been but is not now inside a function.
18 lines
927 B
JavaScript
18 lines
927 B
JavaScript
var fs = require('fs');
|
|
|
|
var dataValid = JSON.parse(fs.readFileSync('test/data/base58_keys_valid.json'));
|
|
var dataInvalid = JSON.parse(fs.readFileSync('test/data/base58_keys_invalid.json'));
|
|
var dataEncodeDecode = JSON.parse(fs.readFileSync('test/data/base58_encode_decode.json'));
|
|
var dataTxValid = JSON.parse(fs.readFileSync('test/data/tx_valid.json'));
|
|
var dataTxInvalid = JSON.parse(fs.readFileSync('test/data/tx_invalid.json'));
|
|
var dataScriptValid = JSON.parse(fs.readFileSync('test/data/script_valid.json'));
|
|
var dataScriptInvalid = JSON.parse(fs.readFileSync('test/data/script_invalid.json'));
|
|
|
|
module.exports.dataValid = dataValid;
|
|
module.exports.dataInvalid = dataInvalid;
|
|
module.exports.dataEncodeDecode = dataEncodeDecode;
|
|
module.exports.dataTxValid = dataTxValid;
|
|
module.exports.dataTxInvalid = dataTxInvalid;
|
|
module.exports.dataScriptValid = dataScriptValid;
|
|
module.exports.dataScriptInvalid = dataScriptInvalid;
|