Merge github.com:MetaMask/metamask-plugin into i1144-moarrpc

This commit is contained in:
Kevin Serrano 2017-03-07 16:02:42 -08:00
commit 970324b699
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
2 changed files with 2 additions and 2 deletions

View File

@ -109,7 +109,7 @@
"valid-url": "^1.0.9",
"vreme": "^3.0.2",
"web3": "0.18.2",
"web3-provider-engine": "^9.1.0",
"web3-provider-engine": "^10.0.0",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},

View File

@ -88,7 +88,7 @@ describe('Personal Message Manager', function() {
})
describe('#normalizeMsgData', function() {
it('converts text to a utf8 buffer', function() {
it('converts text to a utf8 hex string', function() {
var input = 'hello'
var output = messageManager.normalizeMsgData(input)
assert.equal(output, '0x68656c6c6f', 'predictably hex encoded')