aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-31 17:59:17 +0800
committerobscuren <geffobscura@gmail.com>2014-10-31 17:59:17 +0800
commit3ee0461cb5b6e4a5e2d287180afbdb681805a662 (patch)
treef245667a9e3f5f0ff23bb1c89f4f7cc783f4949c /ui
parent8e0a39f33f9d24ebeca9cc88edf24cc6294552d7 (diff)
downloadgo-tangerine-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar
go-tangerine-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.gz
go-tangerine-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.bz2
go-tangerine-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.lz
go-tangerine-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.xz
go-tangerine-3ee0461cb5b6e4a5e2d287180afbdb681805a662.tar.zst
go-tangerine-3ee0461cb5b6e4a5e2d287180afbdb681805a662.zip
Moved ethchain to chain
Diffstat (limited to 'ui')
-rw-r--r--ui/filter.go12
-rw-r--r--ui/qt/filter.go6
2 files changed, 9 insertions, 9 deletions
diff --git a/ui/filter.go b/ui/filter.go
index ad29abbc5..84209861e 100644
--- a/ui/filter.go
+++ b/ui/filter.go
@@ -1,12 +1,12 @@
package ui
import (
- "github.com/ethereum/go-ethereum/ethchain"
+ "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethutil"
)
-func NewFilterFromMap(object map[string]interface{}, eth ethchain.EthManager) *ethchain.Filter {
- filter := ethchain.NewFilter(eth)
+func NewFilterFromMap(object map[string]interface{}, eth chain.EthManager) *chain.Filter {
+ filter := chain.NewFilter(eth)
if object["earliest"] != nil {
val := ethutil.NewValue(object["earliest"])
@@ -46,7 +46,7 @@ func NewFilterFromMap(object map[string]interface{}, eth ethchain.EthManager) *e
}
// Conversion methodn
-func mapToAccountChange(m map[string]interface{}) (d ethchain.AccountChange) {
+func mapToAccountChange(m map[string]interface{}) (d chain.AccountChange) {
if str, ok := m["id"].(string); ok {
d.Address = ethutil.Hex2Bytes(str)
}
@@ -60,9 +60,9 @@ func mapToAccountChange(m map[string]interface{}) (d ethchain.AccountChange) {
// data can come in in the following formats:
// ["aabbccdd", {id: "ccddee", at: "11223344"}], "aabbcc", {id: "ccddee", at: "1122"}
-func makeAltered(v interface{}) (d []ethchain.AccountChange) {
+func makeAltered(v interface{}) (d []chain.AccountChange) {
if str, ok := v.(string); ok {
- d = append(d, ethchain.AccountChange{ethutil.Hex2Bytes(str), nil})
+ d = append(d, chain.AccountChange{ethutil.Hex2Bytes(str), nil})
} else if obj, ok := v.(map[string]interface{}); ok {
d = append(d, mapToAccountChange(obj))
} else if slice, ok := v.([]interface{}); ok {
diff --git a/ui/qt/filter.go b/ui/qt/filter.go
index 1fd99e78e..96c3ab3a3 100644
--- a/ui/qt/filter.go
+++ b/ui/qt/filter.go
@@ -3,12 +3,12 @@ package qt
import (
"fmt"
- "github.com/ethereum/go-ethereum/ethchain"
+ "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ui"
"gopkg.in/qml.v1"
)
-func NewFilterFromMap(object map[string]interface{}, eth ethchain.EthManager) *ethchain.Filter {
+func NewFilterFromMap(object map[string]interface{}, eth chain.EthManager) *chain.Filter {
filter := ui.NewFilterFromMap(object, eth)
if object["altered"] != nil {
@@ -18,7 +18,7 @@ func NewFilterFromMap(object map[string]interface{}, eth ethchain.EthManager) *e
return filter
}
-func makeAltered(v interface{}) (d []ethchain.AccountChange) {
+func makeAltered(v interface{}) (d []chain.AccountChange) {
if qList, ok := v.(*qml.List); ok {
var s []interface{}
qList.Convert(&s)