From 22b694ee1e1044e68c906fbd864797ac2f8a4ab0 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 20 May 2015 02:04:52 +0100 Subject: solc now in ethereum, fixes solc path setting; setSolc() didnt work --- xeth/xeth.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index 7de3e31be..81197d381 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -66,9 +66,6 @@ type XEth struct { // regmut sync.Mutex // register map[string][]*interface{} // TODO improve return type - solcPath string - solc *compiler.Solidity - agent *miner.RemoteAgent } @@ -379,17 +376,12 @@ func (self *XEth) Accounts() []string { // accessor for solidity compiler. // memoized if available, retried on-demand if not func (self *XEth) Solc() (*compiler.Solidity, error) { - var err error - if self.solc == nil { - self.solc, err = compiler.New(self.solcPath) - } - return self.solc, err + return self.backend.Solc() } // set in js console via admin interface or wrapper from cli flags func (self *XEth) SetSolc(solcPath string) (*compiler.Solidity, error) { - self.solcPath = solcPath - self.solc = nil + self.backend.SetSolc(solcPath) return self.Solc() } -- cgit v1.2.3 From b0ae84aa0dae65f00492f981bb61887331def2a5 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 20 May 2015 04:11:48 +0100 Subject: multiple contract source for solidity compiler: returns contract array if multiple contracts. fixes #1023 --- xeth/xeth.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index 81197d381..4925fe635 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -69,6 +69,13 @@ type XEth struct { agent *miner.RemoteAgent } +func NewTest(eth *eth.Ethereum, frontend Frontend) *XEth { + return &XEth{ + backend: eth, + frontend: frontend, + } +} + // New creates an XEth that uses the given frontend. // If a nil Frontend is provided, a default frontend which // confirms all transactions will be used. -- cgit v1.2.3