Comparing version 0.0.13 to 0.0.14
@@ -24,3 +24,3 @@ var assert = require('assert'); | ||
var prefix = string.slice(0, address_prefix.length); | ||
assert.equal(address_prefix, prefix, `Expecting key to begin with ${address_prefix}, instead got ${prefix}`); | ||
assert.equal(address_prefix, prefix, 'Expecting key to begin with ${address_prefix}, instead got ${prefix}'); | ||
var addy = string.slice(address_prefix.length); | ||
@@ -27,0 +27,0 @@ addy = new Buffer(base58.decode(addy), 'binary'); |
var ErrorWithCause = function(message,cause){ | ||
this.message = message; | ||
if ((typeof cause !== "undefined" && cause !== null) ? cause.message : undefined) { | ||
this.message = `cause\t${cause.message}\t` + this.message; | ||
this.message = 'cause\t${cause.message}\t' + this.message; | ||
} | ||
@@ -9,3 +9,3 @@ | ||
if ((typeof cause !== "undefined" && cause !== null) ? cause.stack : undefined) { | ||
stack = `caused by\n\t${cause.stack}\t` + stack; | ||
stack = 'caused by\n\t${cause.stack}\t' + stack; | ||
} | ||
@@ -17,9 +17,9 @@ | ||
var msg = message; | ||
if ((typeof cause !== "undefined" && cause !== null) ? cause.message : undefined) { msg += `\t cause: ${cause.message} `; } | ||
if ((typeof cause !== "undefined" && cause !== null) ? cause.stack : undefined) { msg += `\n stack: ${cause.stack} `; } | ||
if ((typeof cause !== "undefined" && cause !== null) ? cause.message : undefined) { msg += '\t cause: ${cause.message} '; } | ||
if ((typeof cause !== "undefined" && cause !== null) ? cause.stack : undefined) { msg += '\n stack: ${cause.stack} '; } | ||
throw new Error(msg); | ||
} | ||
} | ||
}; | ||
module.exports = new ErrorWithCause(); |
@@ -11,4 +11,4 @@ var ecurve = require('ecurve'); | ||
var G = secp256k1.G | ||
var n = secp256k1.n | ||
var G = secp256k1.G; | ||
var n = secp256k1.n; | ||
@@ -28,3 +28,3 @@ var PrivateKey = function(d) { | ||
if (32 !== buf.length) { | ||
console.log(`WARN: Expecting 32 bytes, instead got ${buf.length}, stack trace:`, new Error().stack); | ||
console.log('WARN: Expecting 32 bytes, instead got ${buf.length}, stack trace:', new Error().stack); | ||
} | ||
@@ -61,3 +61,3 @@ if (buf.length === 0) { | ||
var version = private_wif.readUInt8(0); | ||
assert.equal(0x80, version, `Expected version ${0x80}, instead got ${version}`); | ||
assert.equal(0x80, version, 'Expected version ${0x80}, instead got ${version}'); | ||
// checksum includes the version | ||
@@ -64,0 +64,0 @@ var private_key = private_wif.slice(0, -4); |
@@ -80,3 +80,3 @@ var BigInteger = require('bigi'); | ||
address_prefix, prefix, | ||
`Expecting key to begin with ${address_prefix}, instead got ${prefix}`); | ||
'Expecting key to begin with ${address_prefix}, instead got ${prefix}'); | ||
public_key = public_key.slice(address_prefix.length); | ||
@@ -83,0 +83,0 @@ |
@@ -14,3 +14,3 @@ var Long = (require('bytebuffer')).Long; | ||
if (!v.is_digits(instance_string)) { | ||
throw new `Invalid object id ${object_id}`(); | ||
throw new 'Invalid object id ${object_id}'(); | ||
} | ||
@@ -17,0 +17,0 @@ |
@@ -33,3 +33,3 @@ var ByteBuffer = require('bytebuffer'); | ||
console.error( | ||
`${this.operation_name}.${field}\t`, | ||
'${this.operation_name}.${field}\t', | ||
_b.toHex() | ||
@@ -42,3 +42,3 @@ ); | ||
if(Serializer.printDebug) { | ||
console.error(`Error reading ${this.operation_name}.${field} in data:`); | ||
console.error('Error reading ${this.operation_name}.${field} in data:'); | ||
b.printDebug(); | ||
@@ -45,0 +45,0 @@ } |
@@ -6,3 +6,3 @@ // Low-level types that make up operations | ||
var v = require('./validation'); | ||
var ObjectId = require('./object_id') | ||
var ObjectId = require('./object_id'); | ||
var fp = require('./fast_parser'); | ||
@@ -18,3 +18,3 @@ var chain_types = require('./ChainTypes'); | ||
var toImpliedDecimal; | ||
var Types = {} | ||
var Types = {}; | ||
@@ -36,13 +36,13 @@ var HEX_DUMP = process.env.npm_config__graphene_serializer_hex_dump | ||
fromByteBuffer: function(b){ | ||
var amount = b.readInt64() | ||
var precision = b.readUint8() | ||
var b_copy = b.copy(b.offset, b.offset + 7) | ||
var symbol = new Buffer(b_copy.toBinary(), "binary").toString().replace(/\x00/g, "") | ||
var amount = b.readInt64(); | ||
var precision = b.readUint8(); | ||
var b_copy = b.copy(b.offset, b.offset + 7); | ||
var symbol = new Buffer(b_copy.toBinary(), "binary").toString().replace(/\x00/g, ""); | ||
b.skip(7); | ||
// "1.000 STEEM" always written with full precision | ||
var amount_string = fromImpliedDecimal(amount, precision) | ||
var amount_string = fromImpliedDecimal(amount, precision); | ||
return amount_string + " " + symbol | ||
}, | ||
appendByteBuffer: function(b, object){ | ||
object = object.trim() | ||
object = object.trim(); | ||
if( ! /^[0-9]+\.?[0-9]* [A-Za-z0-9]+$/.test(object)) | ||
@@ -80,3 +80,3 @@ throw new Error("Expecting amount like '99.000 SYMBOL', instead got '" + object + "'") | ||
appendByteBuffer: function(b, object){ | ||
v.require_range(0,0xFF,object, `uint8 ${object}`); | ||
v.require_range(0,0xFF,object, 'uint8 ${object}'); | ||
b.writeUint8(object); | ||
@@ -86,3 +86,3 @@ return; | ||
fromObject: function(object){ | ||
v.require_range(0,0xFF,object, `uint8 ${object}`); | ||
v.require_range(0,0xFF,object, 'uint8 ${object}'); | ||
return object; | ||
@@ -92,3 +92,3 @@ }, | ||
if (debug.use_default && object === undefined) { return 0; } | ||
v.require_range(0,0xFF,object, `uint8 ${object}`); | ||
v.require_range(0,0xFF,object, 'uint8 ${object}'); | ||
return parseInt(object); | ||
@@ -103,3 +103,3 @@ } | ||
appendByteBuffer: function(b, object){ | ||
v.require_range(0,0xFFFF,object, `uint16 ${object}`); | ||
v.require_range(0,0xFFFF,object, 'uint16 ${object}'); | ||
b.writeUint16(object); | ||
@@ -109,3 +109,3 @@ return; | ||
fromObject: function(object){ | ||
v.require_range(0,0xFFFF,object, `uint16 ${object}`); | ||
v.require_range(0,0xFFFF,object, 'uint16 ${object}'); | ||
return object; | ||
@@ -115,3 +115,3 @@ }, | ||
if (debug.use_default && object === undefined) { return 0; } | ||
v.require_range(0,0xFFFF,object, `uint16 ${object}`); | ||
v.require_range(0,0xFFFF,object, 'uint16 ${object}'); | ||
return parseInt(object); | ||
@@ -126,3 +126,3 @@ } | ||
appendByteBuffer: function(b, object){ | ||
v.require_range(0,0xFFFFFFFF,object, `uint32 ${object}`); | ||
v.require_range(0,0xFFFFFFFF,object, 'uint32 ${object}'); | ||
b.writeUint32(object); | ||
@@ -132,3 +132,3 @@ return; | ||
fromObject: function(object){ | ||
v.require_range(0,0xFFFFFFFF,object, `uint32 ${object}`); | ||
v.require_range(0,0xFFFFFFFF,object, 'uint32 ${object}'); | ||
return object; | ||
@@ -138,3 +138,3 @@ }, | ||
if (debug.use_default && object === undefined) { return 0; } | ||
v.require_range(0,0xFFFFFFFF,object, `uint32 ${object}`); | ||
v.require_range(0,0xFFFFFFFF,object, 'uint32 ${object}'); | ||
return parseInt(object); | ||
@@ -156,3 +156,3 @@ } | ||
object, | ||
`uint32 ${object}` | ||
'uint32 ${object}' | ||
); | ||
@@ -167,3 +167,3 @@ b.writeVarint32(object); | ||
object, | ||
`uint32 ${object}` | ||
'uint32 ${object}' | ||
); | ||
@@ -178,3 +178,3 @@ return object; | ||
object, | ||
`uint32 ${object}` | ||
'uint32 ${object}' | ||
); | ||
@@ -428,3 +428,3 @@ return parseInt(object); | ||
var int = parseInt(object); | ||
v.require_range(0,0xFFFFFFFF,int, `uint32 ${object}`); | ||
v.require_range(0,0xFFFFFFFF,int, 'uint32 ${object}'); | ||
return (new Date( int * 1000 )).toISOString().split('.')[0]; | ||
@@ -587,3 +587,3 @@ } | ||
if (debug.use_default && object === undefined) { | ||
return `${reserved_spaces}.${object_type_id}.0`; | ||
return '${reserved_spaces}.${object_type_id}.0'; | ||
} | ||
@@ -596,3 +596,3 @@ v.required(object); | ||
return `${reserved_spaces}.${object_type_id}.`+object; | ||
return '${reserved_spaces}.${object_type_id}.'+object; | ||
}, | ||
@@ -662,6 +662,6 @@ }; | ||
} | ||
v.require_test(/^[0-9]+:[0-9]+$/, object, `vote_id format ${object}`); | ||
v.require_test(/^[0-9]+:[0-9]+$/, object, 'vote_id format ${object}'); | ||
var type, id = object.split(':'); | ||
v.require_range(0,0xff,type,`vote type ${object}`); | ||
v.require_range(0,0xffffff,id,`vote id ${object}`); | ||
v.require_range(0,0xff,type,'vote type ${object}'); | ||
v.require_range(0,0xffffff,id,'vote id ${object}'); | ||
return { type, id }; | ||
@@ -753,5 +753,5 @@ }, | ||
if (HEX_DUMP) { | ||
console.error(`static_variant id 0x${type_id.toString(16)} (${type_id})`); | ||
console.error('static_variant id 0x${type_id.toString(16)} (${type_id})'); | ||
} | ||
v.required(st_operation, `operation ${type_id}`); | ||
v.required(st_operation, 'operation ${type_id}'); | ||
return [ | ||
@@ -766,3 +766,3 @@ type_id, | ||
var st_operation = this.st_operations[type_id]; | ||
v.required(st_operation, `operation ${type_id}`); | ||
v.required(st_operation, 'operation ${type_id}'); | ||
b.writeVarint32(type_id); | ||
@@ -776,3 +776,3 @@ st_operation.appendByteBuffer(b, object[1]); | ||
var st_operation = this.st_operations[type_id]; | ||
v.required(st_operation, `operation ${type_id}`); | ||
v.required(st_operation, 'operation ${type_id}'); | ||
return [ | ||
@@ -790,3 +790,3 @@ type_id, | ||
var st_operation = this.st_operations[type_id]; | ||
v.required(st_operation, `operation ${type_id}`); | ||
v.required(st_operation, 'operation ${type_id}'); | ||
return [ | ||
@@ -942,3 +942,3 @@ st_operation.operation_name, | ||
} | ||
} | ||
}; | ||
@@ -960,2 +960,2 @@ var strCmp = (a, b) => a > b ? 1 : a < b ? -1 : 0 | ||
module.exports = Types | ||
module.exports = Types; |
@@ -34,4 +34,4 @@ var _my; | ||
}, | ||
required(value, field_name){ | ||
required: function(value, field_name){ | ||
if (is_empty(value) ){ | ||
@@ -42,6 +42,6 @@ throw new Error('value required ' + field_name + ' ' + value); | ||
}, | ||
require_long(value, field_name){ | ||
require_long: function(value, field_name){ | ||
if (!Long.isLong(value)) { | ||
throw new Error(`Long value required ${field_name} ${value}`); | ||
throw new Error('Long value required ${field_name} ${value}'); | ||
} | ||
@@ -51,6 +51,6 @@ return value; | ||
string(value){ | ||
string: function(value){ | ||
if (is_empty(value) ){ return value; } | ||
if (typeof value !== "string") { | ||
throw new Error(`string required: ${value}`); | ||
throw new Error('string required: ${value}'); | ||
} | ||
@@ -60,6 +60,6 @@ return value; | ||
number(value){ | ||
number: function(value){ | ||
if (is_empty(value) ){ return value; } | ||
if (typeof value !== "number") { | ||
throw new Error(`number required: ${value}`); | ||
throw new Error('number required: ${value}'); | ||
} | ||
@@ -69,6 +69,6 @@ return value; | ||
whole_number(value, field_name){ | ||
whole_number: function(value, field_name){ | ||
if (is_empty(value) ){ return value; } | ||
if (/\./.test(value) ){ | ||
throw new Error(`whole number required ${field_name} ${value}`); | ||
throw new Error('whole number required ${field_name} ${value}'); | ||
} | ||
@@ -78,6 +78,6 @@ return value; | ||
unsigned(value, field_name){ | ||
unsigned: function(value, field_name){ | ||
if (is_empty(value) ){ return value; } | ||
if (/-/.test(value) ){ | ||
throw new Error(`unsigned required ${field_name} ${value}`); | ||
throw new Error('unsigned required ${field_name} ${value}'); | ||
} | ||
@@ -105,3 +105,3 @@ return value; | ||
to_long(value, field_name){ | ||
to_long: function(value, field_name){ | ||
if (is_empty(value) ){ return value; } | ||
@@ -117,3 +117,3 @@ if (Long.isLong(value) ){ return value; } | ||
to_string(value, field_name){ | ||
to_string: function(value, field_name){ | ||
if (is_empty(value) ){ return value; } | ||
@@ -128,9 +128,9 @@ if (typeof value === "string") { return value; } | ||
} | ||
throw `unsupported type ${field_name}: (${typeof value}) ${value}`; | ||
throw 'unsupported type ${field_name}: (${typeof value}) ${value}'; | ||
}, | ||
require_test(regex, value, field_name){ | ||
require_test: function(regex, value, field_name){ | ||
if (is_empty(value) ){ return value; } | ||
if (!regex.test(value)) { | ||
throw new Error(`unmatched ${regex} ${field_name} ${value}`); | ||
throw new Error('unmatched ${regex} ${field_name} ${value}'); | ||
} | ||
@@ -144,3 +144,3 @@ return value; | ||
if (match === null) { | ||
throw new Error(`unmatched ${regex} ${field_name} ${value}`); | ||
throw new Error('unmatched ${regex} ${field_name} ${value}'); | ||
} | ||
@@ -159,7 +159,7 @@ return match; | ||
// Does not support over 53 bits | ||
require_range(min,max,value, field_name){ | ||
require_range: function(min,max,value, field_name){ | ||
if (is_empty(value) ){ return value; } | ||
var number = to_number(value); | ||
if (value < min || value > max) { | ||
throw new Error(`out of range ${value} ${field_name} ${value}`); | ||
throw new Error('out of range ${value} ${field_name} ${value}'); | ||
} | ||
@@ -176,7 +176,7 @@ return value; | ||
if (!object_type) { | ||
throw new Error(`Unknown object type: ${type}, ${field_name}, ${value}`); | ||
throw new Error('Unknown object type: ${type}, ${field_name}, ${value}'); | ||
} | ||
var re = new RegExp(`${reserved_spaces}\.${object_type}\.[0-9]+$`); | ||
var re = new RegExp('${reserved_spaces}\.${object_type}\.[0-9]+$'); | ||
if (!re.test(value)) { | ||
throw new Error(`Expecting ${type} in format `+ `${reserved_spaces}.${object_type}.[0-9]+ `+ `instead of ${value} ${field_name} ${value}`); | ||
throw new Error('Expecting ${type} in format '+ '${reserved_spaces}.${object_type}.[0-9]+ '+ 'instead of ${value} ${field_name} ${value}'); | ||
} | ||
@@ -221,3 +221,3 @@ return value; | ||
get_protocol_type_name(value, field_name){ | ||
get_protocol_type_name: function(value, field_name){ | ||
if (is_empty(value) ){ return value; } | ||
@@ -240,6 +240,6 @@ var type_id = get_protocol_type(value, field_name); | ||
// signed / unsigned decimal | ||
no_overflow53(value, field_name){ | ||
no_overflow53: function(value, field_name){ | ||
if (typeof value === "number") { | ||
if (value > MAX_SAFE_INT || value < MIN_SAFE_INT) { | ||
throw new Error(`overflow ${field_name} ${value}`); | ||
throw new Error('overflow ${field_name} ${value}'); | ||
} | ||
@@ -251,3 +251,3 @@ return; | ||
if (value > MAX_SAFE_INT || value < MIN_SAFE_INT) { | ||
throw new Error(`overflow ${field_name} ${value}`); | ||
throw new Error('overflow ${field_name} ${value}'); | ||
} | ||
@@ -261,7 +261,7 @@ return; | ||
} | ||
throw `unsupported type ${field_name}: (${typeof value}) ${value}`; | ||
throw 'unsupported type ${field_name}: (${typeof value}) ${value}'; | ||
}, | ||
// signed / unsigned whole numbers only | ||
no_overflow64(value, field_name){ | ||
no_overflow64: function(value, field_name){ | ||
// https://github.com/dcodeIO/Long.js/issues/20 | ||
@@ -290,3 +290,3 @@ if (Long.isLong(value) ){ return; } | ||
if (long_string !== value.trim()) { | ||
throw new Error(`overflow ${field_name} ${value}`); | ||
throw new Error('overflow ${field_name} ${value}'); | ||
} | ||
@@ -297,3 +297,3 @@ return; | ||
if (value > MAX_SAFE_INT || value < MIN_SAFE_INT) { | ||
throw new Error(`overflow ${field_name} ${value}`); | ||
throw new Error('overflow ${field_name} ${value}'); | ||
} | ||
@@ -303,4 +303,4 @@ return; | ||
throw `unsupported type ${field_name}: (${typeof value}) ${value}`; | ||
throw 'unsupported type ${field_name}: (${typeof value}) ${value}'; | ||
} | ||
}; |
{ | ||
"name": "steemauth", | ||
"version": "0.0.13", | ||
"version": "0.0.14", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
103778