fixed #161, web3.ssh.post

dist/web3-light.js

@@ -804,7 +804,7 @@ var toAscii = function(hex) {
 /**
  * Shold be called to get hex representation (prefixed by 0x) of ascii string 
  *
- * @method fromAscii
+ * @method toHexNative
  * @param {String} string
  * @returns {String} hex representation of input string
  */
@@ -2304,9 +2304,11 @@ var inputPostFormatter = function(post) {
 
     post.payload = utils.toHex(post.payload);
     post.ttl = utils.fromDecimal(post.ttl);
+    post.workToProve = utils.fromDecimal(post.workToProve);
     post.priority = utils.fromDecimal(post.priority);
 
-    if(!utils.isArray(post.topics)) {
+    // fallback
+    if (!utils.isArray(post.topics)) {
         post.topics = [post.topics];
     }
 
@@ -3118,7 +3120,7 @@ var post = new Method({
     name: 'post', 
     call: 'shh_post', 
     params: 1,
-    inputFormatter: formatters.inputPostFormatter
+    inputFormatter: [formatters.inputPostFormatter]
 });
 
 var newIdentity = new Method({

lib/utils/utils.js

@@ -112,7 +112,7 @@ var toAscii = function(hex) {
 /**
  * Shold be called to get hex representation (prefixed by 0x) of ascii string 
  *
- * @method fromAscii
+ * @method toHexNative
  * @param {String} string
  * @returns {String} hex representation of input string
  */

lib/web3/formatters.js

@@ -155,9 +155,11 @@ var inputPostFormatter = function(post) {
 
     post.payload = utils.toHex(post.payload);
     post.ttl = utils.fromDecimal(post.ttl);
+    post.workToProve = utils.fromDecimal(post.workToProve);
     post.priority = utils.fromDecimal(post.priority);
 
-    if(!utils.isArray(post.topics)) {
+    // fallback
+    if (!utils.isArray(post.topics)) {
         post.topics = [post.topics];
     }
 

lib/web3/shh.js

@@ -27,7 +27,7 @@ var post = new Method({
     name: 'post', 
     call: 'shh_post', 
     params: 1,
-    inputFormatter: formatters.inputPostFormatter
+    inputFormatter: [formatters.inputPostFormatter]
 });
 
 var newIdentity = new Method({

test/formatters.inputPostFormatter.js

@@ -20,7 +20,8 @@ describe('formatters', function () {
                 payload: '0x7b2274657374223a2274657374227d',
                 ttl: '0xc8',
                 priority: '0x3e8',
-                topics: ['0x68656c6c6f','0x6d79746f70696373']
+                topics: ['0x68656c6c6f','0x6d79746f70696373'],
+                workToProve: '0x0'
             });
 
         });

test/helpers/test.method.js

@@ -2,6 +2,7 @@ var chai = require('chai');
 var assert = chai.assert;
 var web3 = require('../../index');
 var FakeHttpProvider = require('./FakeHttpProvider');
+var clone = function (object) { return JSON.parse(JSON.stringify(object)); };
 
 var runTests = function (obj, method, tests) {
 
@@ -22,10 +23,18 @@ var runTests = function (obj, method, tests) {
                         assert.deepEqual(payload.params, test.formattedArgs);
                     });
 
+                    var args = clone(test.args)
+
                     // when
-                    var result = (obj)
+                    if (obj) {
-                        ? web3[obj][method].apply(null, test.args.slice(0))
+                        var result = web3[obj][method].apply(null, args);
-                        : web3[method].apply(null, test.args.slice(0));
+                    } else {
+                        var result = web3[method].apply(null, args);
+                    }
+                    // when
+                    //var result = (obj)
+                        //? web3[obj][method].apply(null, test.args.slice(0))
+                        //: web3[method].apply(null, test.args.slice(0));
                     
                     // then 
                     assert.deepEqual(test.formattedResult, result);
@@ -43,7 +52,8 @@ var runTests = function (obj, method, tests) {
                         assert.deepEqual(payload.params, test.formattedArgs);
                     });
 
-                    var args = test.args.slice(0);
+                    var args = clone(test.args);
+                   
                     // add callback
                     args.push(function (err, result) {
                         assert.deepEqual(test.formattedResult, result);
@@ -51,10 +61,11 @@ var runTests = function (obj, method, tests) {
                     });
 
                     // when
-                    if(obj)
+                    if (obj) {
                         web3[obj][method].apply(null, args);
-                    else
+                    } else {
                         web3[method].apply(null, args);
+                    }
                 });
             });
         });

test/web3.shh.post.js

@@ -0,0 +1,49 @@
+var chai = require('chai');
+var web3 = require('../index');
+var testMethod = require('./helpers/test.method.js');
+
+var method = 'post';
+
+var tests = [{
+    args: [{
+        from: '0x123123123',
+        topics: ['hello_world'],
+        payload: '12345',
+        ttl: 100,
+        workToProve: 101
+    }],
+    formattedArgs: [{
+        from: '0x123123123',
+        topics: [web3.fromAscii('hello_world')],
+        payload: web3.toHex('12345'),
+        ttl: web3.toHex('100'),
+        workToProve: web3.toHex('101'),
+        priority: '0x0'
+    }],
+    result: true,
+    formattedResult: true,
+    call: 'shh_'+ method
+}, {
+    args: [{
+        from: '0x21312',
+        topics: ['hello_world'],
+        payload: '0x12345',
+        ttl: 0x100,
+        workToProve: 0x101,
+        priority: 0x15
+    }],
+    formattedArgs: [{
+        from: '0x21312',
+        topics: [web3.fromAscii('hello_world')],
+        payload: '0x12345',
+        ttl: '0x100',
+        workToProve: '0x101',
+        priority: '0x15'
+    }],
+    result: true,
+    formattedResult: true,
+    call: 'shh_'+ method
+}];
+
+testMethod.runTests('shh', method, tests);
+