From 03371b74d7b169c0ad6ccf8868bc97c7fe85169d Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 13 May 2014 12:42:01 +0200
Subject: [PATCH] Public ethereum interface uses EthManager
---
ethereal/ethereum.go | 2 +-
ethereal/ui/ext_app.go | 2 +-
ethereal/ui/gui.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go
index bacf6d446..d848e9a68 100644
--- a/ethereal/ethereum.go
+++ b/ethereal/ethereum.go
@@ -100,7 +100,7 @@ func main() {
}
if StartRpc {
- ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum.StateManager(), ethereum.BlockChain(), ethereum.TxPool()))
+ ethereum.RpcServer = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
if err != nil {
log.Println("Could not start RPC interface:", err)
} else {
diff --git a/ethereal/ui/ext_app.go b/ethereal/ui/ext_app.go
index 93db0ade1..de5f15db6 100644
--- a/ethereal/ui/ext_app.go
+++ b/ethereal/ui/ext_app.go
@@ -34,7 +34,7 @@ type ExtApplication struct {
func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication {
app := &ExtApplication{
- ethpub.NewPEthereum(lib.eth.StateManager(), lib.eth.BlockChain(), lib.eth.TxPool()),
+ ethpub.NewPEthereum(lib.eth),
make(chan ethutil.React, 1),
make(chan ethutil.React, 1),
make(chan bool),
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index c1fda47f4..3393b1101 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -53,7 +53,7 @@ func New(ethereum *eth.Ethereum) *Gui {
//ethereum.StateManager().WatchAddr(addr)
}
- pub := ethpub.NewPEthereum(ethereum.StateManager(), ethereum.BlockChain(), ethereum.TxPool())
+ pub := ethpub.NewPEthereum(ethereum)
return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub}
}
--
GitLab