Skip to content
This repository has been archived by the owner on Jan 11, 2022. It is now read-only.

Commit

Permalink
Merge pull request #66 from ethereumjs/use-local-version-of-official-…
Browse files Browse the repository at this point in the history 
…tests

Use local version of ethereumjs-testing, fix hex-prefix issue
  • Loading branch information
@holgerd77
holgerd77 authored Jan 14, 2019
2 parents 1ad130a + 95c2623 commit 261296f
Show file tree
Hide file tree
Showing 3 changed files with 172 additions and 4 deletions.
1 change: 0 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"@types/node": "^10.12.2",
"bn.js": "^4.11.1",
"coveralls": "^2.11.4",
"ethereumjs-testing": "git+https://github.com/ethereumjs/ethereumjs-testing.git",
"mocha": "4.1.0",
"nyc": "^13.1.0",
"prettier": "^1.15.2",
Expand Down
170 changes: 170 additions & 0 deletions test/fixture/rlptest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"source": "https://github.com/ethereum/tests/blob/develop/RLPTests/rlptest.json",
"version": "ethereum/tests v6.0.0-beta.3",
"commit": "b2dcd19973637ac05e17646378dac9cbb2927075",
"date": "2019-01-14",
"tests": {
"emptystring": {
"in": "",
"out": "0x80"
},
"bytestring00": {
"in": "\u0000",
"out": "0x00"
},
"bytestring01": {
"in": "\u0001",
"out": "0x01"
},
"bytestring7F": {
"in": "\u007F",
"out": "0x7f"
},
"shortstring": {
"in": "dog",
"out": "0x83646f67"
},
"shortstring2": {
"in": "Lorem ipsum dolor sit amet, consectetur adipisicing eli",
"out": "0xb74c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c69"
},
"longstring": {
"in": "Lorem ipsum dolor sit amet, consectetur adipisicing elit",
"out": "0xb8384c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c6974"
},
"longstring2": {
"in": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur mauris magna, suscipit sed vehicula non, iaculis faucibus tortor. Proin suscipit ultricies malesuada. Duis tortor elit, dictum quis tristique eu, ultrices at risus. Morbi a est imperdiet mi ullamcorper aliquet suscipit nec lorem. Aenean quis leo mollis, vulputate elit varius, consequat enim. Nulla ultrices turpis justo, et posuere urna consectetur nec. Proin non convallis metus. Donec tempor ipsum in mauris congue sollicitudin. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse convallis sem vel massa faucibus, eget lacinia lacus tempor. Nulla quis ultricies purus. Proin auctor rhoncus nibh condimentum mollis. Aliquam consequat enim at metus luctus, a eleifend purus egestas. Curabitur at nibh metus. Nam bibendum, neque at auctor tristique, lorem libero aliquet arcu, non interdum tellus lectus sit amet eros. Cras rhoncus, metus ac ornare cursus, dolor justo ultrices metus, at ullamcorper volutpat",
"out": "0xb904004c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e73656374657475722061646970697363696e6720656c69742e20437572616269747572206d6175726973206d61676e612c20737573636970697420736564207665686963756c61206e6f6e2c20696163756c697320666175636962757320746f72746f722e2050726f696e20737573636970697420756c74726963696573206d616c6573756164612e204475697320746f72746f7220656c69742c2064696374756d2071756973207472697374697175652065752c20756c7472696365732061742072697375732e204d6f72626920612065737420696d70657264696574206d6920756c6c616d636f7270657220616c6971756574207375736369706974206e6563206c6f72656d2e2041656e65616e2071756973206c656f206d6f6c6c69732c2076756c70757461746520656c6974207661726975732c20636f6e73657175617420656e696d2e204e756c6c6120756c74726963657320747572706973206a7573746f2c20657420706f73756572652075726e6120636f6e7365637465747572206e65632e2050726f696e206e6f6e20636f6e76616c6c6973206d657475732e20446f6e65632074656d706f7220697073756d20696e206d617572697320636f6e67756520736f6c6c696369747564696e2e20566573746962756c756d20616e746520697073756d207072696d697320696e206661756369627573206f726369206c756374757320657420756c74726963657320706f737565726520637562696c69612043757261653b2053757370656e646973736520636f6e76616c6c69732073656d2076656c206d617373612066617563696275732c2065676574206c6163696e6961206c616375732074656d706f722e204e756c6c61207175697320756c747269636965732070757275732e2050726f696e20617563746f722072686f6e637573206e69626820636f6e64696d656e74756d206d6f6c6c69732e20416c697175616d20636f6e73657175617420656e696d206174206d65747573206c75637475732c206120656c656966656e6420707572757320656765737461732e20437572616269747572206174206e696268206d657475732e204e616d20626962656e64756d2c206e6571756520617420617563746f72207472697374697175652c206c6f72656d206c696265726f20616c697175657420617263752c206e6f6e20696e74657264756d2074656c6c7573206c65637475732073697420616d65742065726f732e20437261732072686f6e6375732c206d65747573206163206f726e617265206375727375732c20646f6c6f72206a7573746f20756c747269636573206d657475732c20617420756c6c616d636f7270657220766f6c7574706174"
},
"zero": {
"in": 0,
"out": "0x80"
},
"smallint": {
"in": 1,
"out": "0x01"
},
"smallint2": {
"in": 16,
"out": "0x10"
},
"smallint3": {
"in": 79,
"out": "0x4f"
},
"smallint4": {
"in": 127,
"out": "0x7f"
},
"mediumint1": {
"in": 128,
"out": "0x8180"
},
"mediumint2": {
"in": 1000,
"out": "0x8203e8"
},
"mediumint3": {
"in": 100000,
"out": "0x830186a0"
},
"mediumint4": {
"in": "#83729609699884896815286331701780722",
"out": "0x8f102030405060708090a0b0c0d0e0f2"
},
"mediumint5": {
"in": "#105315505618206987246253880190783558935785933862974822347068935681",
"out": "0x9c0100020003000400050006000700080009000a000b000c000d000e01"
},
"emptylist": {
"in": [],
"out": "0xc0"
},
"stringlist": {
"in": ["dog", "god", "cat"],
"out": "0xcc83646f6783676f6483636174"
},
"multilist": {
"in": ["zw", [4], 1],
"out": "0xc6827a77c10401"
},
"shortListMax1": {
"in": [
"asdf",
"qwer",
"zxcv",
"asdf",
"qwer",
"zxcv",
"asdf",
"qwer",
"zxcv",
"asdf",
"qwer"
],
"out": "0xf784617364668471776572847a78637684617364668471776572847a78637684617364668471776572847a78637684617364668471776572"
},
"longList1": {
"in": [
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"]
],
"out": "0xf840cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376"
},
"longList2": {
"in": [
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"],
["asdf", "qwer", "zxcv"]
],
"out": "0xf90200cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376cf84617364668471776572847a786376"
},
"listsoflists": {
"in": [[[], []], []],
"out": "0xc4c2c0c0c0"
},
"listsoflists2": {
"in": [[], [[]], [[], [[]]]],
"out": "0xc7c0c1c0c3c0c1c0"
},
"dictTest1": {
"in": [["key1", "val1"], ["key2", "val2"], ["key3", "val3"], ["key4", "val4"]],
"out": "0xecca846b6579318476616c31ca846b6579328476616c32ca846b6579338476616c33ca846b6579348476616c34"
},
"bigint": {
"in": "#115792089237316195423570985008687907853269984665640564039457584007913129639936",
"out": "0xa1010000000000000000000000000000000000000000000000000000000000000000"
}
}
}
5 changes: 2 additions & 3 deletions test/official.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import * as assert from 'assert'
import * as RLP from '../src'
const BN = require('bn.js')
const testing = require('ethereumjs-testing')

describe('offical tests', function() {
const officalTests = testing.getSingleFile('RLPTests/rlptest.json')
const officalTests = require('./fixture/rlptest.json').tests

for (const testName in officalTests) {
it(`should pass ${testName}`, function(done) {
Expand All @@ -16,7 +15,7 @@ describe('offical tests', function() {
}

const encoded = RLP.encode(incoming)
assert.equal(encoded.toString('hex'), officalTests[testName].out.toLowerCase())
assert.equal('0x' + encoded.toString('hex'), officalTests[testName].out.toLowerCase())
done()
})
}
Expand Down

0 comments on commit 261296f

Please sign in to comment.