cmd/geth, jsre: updated ethereum.js => web3.js

92c63275 · obscuren · 516f49c8 · 92c63275 · 92c63275 · 92c63275
Commit 92c63275 authored Apr 24, 2015 by obscuren
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

.gitmodules .gitmodules +1 -1

js.go cmd/geth/js.go +1 -1

ethereum_js.go jsre/ethereum_js.go +3 -1

No files found.
--- a/.gitmodules
+++ b/.gitmodules
 [submodule "cmd/mist/assets/ext/ethereum.js"]
 	path = cmd/mist/assets/ext/ethereum.js
-	url = https://github.com/ethereum/ethereum.js
+	url = https://github.com/ethereum/web3.js
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -118,7 +118,7 @@ func (js *jsre) apiBindings() {
 		utils.Fatalf("Error loading ethereum.js: %v", err)
 	}
-	_, err = js.re.Eval("var web3 = require('ethereum.js');")
+	_, err = js.re.Eval("var web3 = require('web3');")
 	if err != nil {
 		utils.Fatalf("Error requiring web3: %v", err)
 	}

--- a/jsre/ethereum_js.go
+++ b/jsre/ethereum_js.go