diff options
| author | zelig <viktor.tron@gmail.com> | 2015-05-20 09:04:52 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-05-20 09:47:13 +0800 |
| commit | 22b694ee1e1044e68c906fbd864797ac2f8a4ab0 (patch) | |
| tree | 498477c69b6715c41a0c5e8c6ddfe20f06ca5e93 /cmd | |
| parent | f9abcee0f9185d41c71cc24af1303133497ebeb0 (diff) | |
| download | dexon-22b694ee1e1044e68c906fbd864797ac2f8a4ab0.tar dexon-22b694ee1e1044e68c906fbd864797ac2f8a4ab0.tar.gz dexon-22b694ee1e1044e68c906fbd864797ac2f8a4ab0.tar.bz2 dexon-22b694ee1e1044e68c906fbd864797ac2f8a4ab0.tar.lz dexon-22b694ee1e1044e68c906fbd864797ac2f8a4ab0.tar.xz dexon-22b694ee1e1044e68c906fbd864797ac2f8a4ab0.tar.zst dexon-22b694ee1e1044e68c906fbd864797ac2f8a4ab0.zip | |
solc now in ethereum, fixes solc path setting; setSolc() didnt work
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/js.go | 3 | ||||
| -rw-r--r-- | cmd/geth/js_test.go | 3 | ||||
| -rw-r--r-- | cmd/geth/main.go | 2 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 4ddb3bd9c..f99051a1e 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -71,7 +71,7 @@ type jsre struct { prompter } -func newJSRE(ethereum *eth.Ethereum, libPath, solcPath, corsDomain string, interactive bool, f xeth.Frontend) *jsre { +func newJSRE(ethereum *eth.Ethereum, libPath, corsDomain string, interactive bool, f xeth.Frontend) *jsre { js := &jsre{ethereum: ethereum, ps1: "> "} // set default cors domain used by startRpc from CLI flag js.corsDomain = corsDomain @@ -81,7 +81,6 @@ func newJSRE(ethereum *eth.Ethereum, libPath, solcPath, corsDomain string, inter js.xeth = xeth.New(ethereum, f) js.wait = js.xeth.UpdateState() // update state in separare forever blocks - js.xeth.SetSolc(solcPath) js.re = re.New(libPath) js.apiBindings(f) js.adminBindings() diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 2f29612d3..8ffef4970 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -76,6 +76,7 @@ func testJEthRE(t *testing.T) (string, *testjethre, *eth.Ethereum) { AccountManager: am, MaxPeers: 0, Name: "test", + SolcPath: testSolcPath, }) if err != nil { t.Fatal("%v", err) @@ -102,7 +103,7 @@ func testJEthRE(t *testing.T) (string, *testjethre, *eth.Ethereum) { t.Errorf("Error creating DocServer: %v", err) } tf := &testjethre{ds: ds, stateDb: ethereum.ChainManager().State().Copy()} - repl := newJSRE(ethereum, assetPath, testSolcPath, "", false, tf) + repl := newJSRE(ethereum, assetPath, "", false, tf) tf.jsre = repl return tmp, tf, ethereum } diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 2afc92f10..d102e3158 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -326,7 +326,6 @@ func console(ctx *cli.Context) { repl := newJSRE( ethereum, ctx.String(utils.JSpathFlag.Name), - ctx.String(utils.SolcPathFlag.Name), ctx.GlobalString(utils.RPCCORSDomainFlag.Name), true, nil, @@ -348,7 +347,6 @@ func execJSFiles(ctx *cli.Context) { repl := newJSRE( ethereum, ctx.String(utils.JSpathFlag.Name), - ctx.String(utils.SolcPathFlag.Name), ctx.GlobalString(utils.RPCCORSDomainFlag.Name), false, nil, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f646e4fcc..2766e7517 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -313,6 +313,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { Dial: true, BootNodes: ctx.GlobalString(BootnodesFlag.Name), GasPrice: common.String2Big(ctx.GlobalString(GasPriceFlag.Name)), + SolcPath: ctx.GlobalString(SolcPathFlag.Name), } } |