aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-04-24 17:02:20 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-04-24 17:02:20 +0800
commit1a137629e31ac63d44fcdd72ddf454b1ce692354 (patch)
tree1111a785b9b9e93ba375aa72b888af904b638e8f
parent7471709ee081b6b4ffd1f324f2c755359151600d (diff)
downloaddexon-solidity-1a137629e31ac63d44fcdd72ddf454b1ce692354.tar
dexon-solidity-1a137629e31ac63d44fcdd72ddf454b1ce692354.tar.gz
dexon-solidity-1a137629e31ac63d44fcdd72ddf454b1ce692354.tar.bz2
dexon-solidity-1a137629e31ac63d44fcdd72ddf454b1ce692354.tar.lz
dexon-solidity-1a137629e31ac63d44fcdd72ddf454b1ce692354.tar.xz
dexon-solidity-1a137629e31ac63d44fcdd72ddf454b1ce692354.tar.zst
dexon-solidity-1a137629e31ac63d44fcdd72ddf454b1ce692354.zip
Squashed 'libjsqrc/ethereumjs/' changes from f8a43ed..c74c854
c74c854 version 0.3.2 9fa9cc7 fixed fixed size bytes encoding and decoding git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: c74c854b56cb76bfc941d7aef8a135b7c1cfc4b3
-rw-r--r--coder.decodeParam.js9
-rw-r--r--coder.encodeParam.js9
2 files changed, 12 insertions, 6 deletions
diff --git a/coder.decodeParam.js b/coder.decodeParam.js
index 6fbeb853..0a67bda0 100644
--- a/coder.decodeParam.js
+++ b/coder.decodeParam.js
@@ -3,9 +3,12 @@ var assert = chai.assert;
var coder = require('../lib/solidity/coder');
var tests = [
- { type: 'int', value: '0000000000000000000000000000000000000000000000000000000000000001', expected: 1},
- { type: 'int', value: '0000000000000000000000000000000000000000000000000000000000000010', expected: 16},
- { type: 'int', value: 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', expected: -1}
+ { type: 'int', value: '0000000000000000000000000000000000000000000000000000000000000001', expected: 1},
+ { type: 'int', value: '0000000000000000000000000000000000000000000000000000000000000010', expected: 16},
+ { type: 'int', value: 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', expected: -1},
+ { type: 'bytes32', value: '6761766f66796f726b0000000000000000000000000000000000000000000000', expected: 'gavofyork'},
+ { type: 'bytes', value: '0000000000000000000000000000000000000000000000000000000000000009' +
+ '6761766f66796f726b0000000000000000000000000000000000000000000000', expected: 'gavofyork'}
];
describe('lib/solidity/coder', function () {
diff --git a/coder.encodeParam.js b/coder.encodeParam.js
index 52b0a04d..1a4df06b 100644
--- a/coder.encodeParam.js
+++ b/coder.encodeParam.js
@@ -3,9 +3,12 @@ var assert = chai.assert;
var coder = require('../lib/solidity/coder');
var tests = [
- { type: 'int', value: 1, expected: '0000000000000000000000000000000000000000000000000000000000000001'},
- { type: 'int', value: 16, expected: '0000000000000000000000000000000000000000000000000000000000000010'},
- { type: 'int', value: -1, expected: 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'}
+ { type: 'int', value: 1, expected: '0000000000000000000000000000000000000000000000000000000000000001'},
+ { type: 'int', value: 16, expected: '0000000000000000000000000000000000000000000000000000000000000010'},
+ { type: 'int', value: -1, expected: 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'},
+ { type: 'bytes32', value: 'gavofyork', expected: '6761766f66796f726b0000000000000000000000000000000000000000000000'},
+ { type: 'bytes', value: 'gavofyork', expected: '0000000000000000000000000000000000000000000000000000000000000009' +
+ '6761766f66796f726b0000000000000000000000000000000000000000000000'}
];
describe('lib/solidity/coder', function () {