diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-08 08:02:42 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-03-08 08:02:42 +0800 |
| commit | 970324b6993c796993beadae0696181d31260f87 (patch) | |
| tree | 45b021fc40c21efa3690a801ad0dd590b29d9907 | |
| parent | e7e024bcdd2c93b34a0baf8bc27e6c571c098476 (diff) | |
| parent | 042b042da6f9816a0070538aae92e473a7fbf4e2 (diff) | |
| download | tangerine-wallet-browser-970324b6993c796993beadae0696181d31260f87.tar tangerine-wallet-browser-970324b6993c796993beadae0696181d31260f87.tar.gz tangerine-wallet-browser-970324b6993c796993beadae0696181d31260f87.tar.bz2 tangerine-wallet-browser-970324b6993c796993beadae0696181d31260f87.tar.lz tangerine-wallet-browser-970324b6993c796993beadae0696181d31260f87.tar.xz tangerine-wallet-browser-970324b6993c796993beadae0696181d31260f87.tar.zst tangerine-wallet-browser-970324b6993c796993beadae0696181d31260f87.zip | |
Merge github.com:MetaMask/metamask-plugin into i1144-moarrpc
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test/unit/personal-message-manager-test.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 0c4ca9096..839f7bcd2 100644 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/test/unit/personal-message-manager-test.js b/test/unit/personal-message-manager-test.js index 77e1656c5..f2c01392c 100644 --- a/test/unit/personal-message-manager-test.js +++ b/test/unit/personal-message-manager-test.js @@ -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') |