gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/rpc

Browse Source
This commit is contained in:
Maran
2014-05-05 14:17:20 +02:00
parent e94e5ac75d 91824af46b
commit cb9ca992de
5 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ethereal/ui/ext_app.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
"math/big"
)
type AppContainer interface {
@@ -18,7 +17,7 @@ type AppContainer interface {
NewBlock(*ethchain.Block)
ObjectChanged(*ethchain.StateObject)
StorageChanged(*ethchain.StateObject, []byte, *big.Int)
StorageChanged(*ethchain.StorageState)
}
type ExtApplication struct {
@@ -105,8 +104,8 @@ out:
case object := <-app.changeChan:
if stateObject, ok := object.Resource.(*ethchain.StateObject); ok {
app.container.ObjectChanged(stateObject)
} else if _, ok := object.Resource.(*big.Int); ok {
//
} else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok {
app.container.StorageChanged(storageObject)
}
}
}

5
ethereal/ui/html_container.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
"math/big"
"path/filepath"
)
@@ -65,8 +64,8 @@ func (app *HtmlApplication) ObjectChanged(stateObject *ethchain.StateObject) {
app.webView.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject))
}
func (app *HtmlApplication) StorageChanged(stateObject *ethchain.StateObject, addr []byte, value *big.Int) {
app.webView.Call("onStorageChangeCb", nil)
func (app *HtmlApplication) StorageChanged(storageObject *ethchain.StorageState) {
app.webView.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject))
}
func (app *HtmlApplication) Destroy() {