changed extend to _extend

web3 · Jun 8, 2015 · 7518ed4 · 7518ed4
1 parent d14c706
commit 7518ed4
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 31 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/web3.js b/lib/web3.js
@@ -151,7 +151,7 @@ Object.defineProperty(web3.eth, 'defaultAccount', {
 
 
 // EXTEND
-web3.extend = function(extension){
+web3._extend = function(extension){
     /*jshint maxcomplexity: 6 */
 
     if(extension.property && !web3[extension.property])
@@ -160,10 +160,10 @@ web3.extend = function(extension){
     setupMethods(web3[extension.property] || web3, extension.methods || []);
     setupProperties(web3[extension.property] || web3, extension.properties || []);
 };
-web3.extend.formatters = formatters;
-web3.extend.utils = utils;
-web3.extend.Method = require('./web3/method');
-web3.extend.Property = require('./web3/property');
+web3._extend.formatters = formatters;
+web3._extend.utils = utils;
+web3._extend.Method = require('./web3/method');
+web3._extend.Property = require('./web3/property');
 
 
 /// setups all api methods

diff --git a/test/web3.extend.js b/test/web3.extend.js
@@ -5,40 +5,40 @@ var web3 = require('../lib/web3');
 
 
 var tests = [{
-    properties: [new web3.extend.Property({
+    properties: [new web3._extend.Property({
         name: 'gasPrice',
         getter: 'eth_gasPrice',
-        outputFormatter: web3.extend.formatters.outputBigNumberFormatter
+        outputFormatter: web3._extend.formatters.outputBigNumberFormatter
     })]
 },{
-    methods: [new web3.extend.Method({
+    methods: [new web3._extend.Method({
         name: 'getBalance',
         call: 'eth_getBalance',
         params: 2,
-        inputFormatter: [web3.extend.utils.toAddress, web3.extend.formatters.inputDefaultBlockNumberFormatter],
-        outputFormatter: web3.extend.formatters.outputBigNumberFormatter
+        inputFormatter: [web3._extend.utils.toAddress, web3._extend.formatters.inputDefaultBlockNumberFormatter],
+        outputFormatter: web3._extend.formatters.outputBigNumberFormatter
     })]
 },{
     property: 'admin',
-    properties: [new web3.extend.Property({
+    properties: [new web3._extend.Property({
         name: 'gasPrice',
         getter: 'eth_gasPrice',
-        outputFormatter: web3.extend.formatters.outputBigNumberFormatter
+        outputFormatter: web3._extend.formatters.outputBigNumberFormatter
     })],
-    methods: [new web3.extend.Method({
+    methods: [new web3._extend.Method({
         name: 'getBalance',
         call: 'eth_getBalance',
         params: 2,
-        inputFormatter: [web3.extend.utils.toAddress, web3.extend.formatters.inputDefaultBlockNumberFormatter],
-        outputFormatter: web3.extend.formatters.outputBigNumberFormatter
+        inputFormatter: [web3._extend.utils.toAddress, web3._extend.formatters.inputDefaultBlockNumberFormatter],
+        outputFormatter: web3._extend.formatters.outputBigNumberFormatter
     })]
 }];
 
 describe('web3', function () {
-    describe('extend', function () {
+    describe('_extend', function () {
         tests.forEach(function (test, index) {
             it('test no: ' + index, function () {
-                web3.extend(test);
+                web3._extend(test);
 
 
                 if(test.properties)