aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-09-14 19:27:20 +0800
committerobscuren <geffobscura@gmail.com>2014-09-14 19:27:20 +0800
commit3dfda15ef39c4d08ba27ffd9f4a8350aa817e6e0 (patch)
tree04f333780149d25a9550b260d2940718b3d267cc
parentddefa11695f9fabaaa0a5f76fe754571829df6ec (diff)
downloaddexon-3dfda15ef39c4d08ba27ffd9f4a8350aa817e6e0.tar.gz
dexon-3dfda15ef39c4d08ba27ffd9f4a8350aa817e6e0.tar.zst
dexon-3dfda15ef39c4d08ba27ffd9f4a8350aa817e6e0.zip
removed ffi
-rw-r--r--ethereal/flags.go7
-rw-r--r--ethereal/gui.go6
2 files changed, 6 insertions, 7 deletions
diff --git a/ethereal/flags.go b/ethereal/flags.go
index c9327c3d3..382f093aa 100644
--- a/ethereal/flags.go
+++ b/ethereal/flags.go
@@ -1,15 +1,16 @@
package main
import (
- "bitbucket.org/kardianos/osext"
"flag"
"fmt"
- "github.com/ethereum/eth-go/ethlog"
"os"
"os/user"
"path"
"path/filepath"
"runtime"
+
+ "bitbucket.org/kardianos/osext"
+ "github.com/ethereum/eth-go/ethlog"
)
var Identifier string
@@ -78,7 +79,7 @@ func Init() {
flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use")
flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
flag.StringVar(&OutboundPort, "port", "30303", "listening port")
- flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
+ flag.BoolVar(&UseUPnP, "upnp", true, "enable UPnP support")
flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
diff --git a/ethereal/gui.go b/ethereal/gui.go
index 173974c4b..0b1b322ad 100644
--- a/ethereal/gui.go
+++ b/ethereal/gui.go
@@ -13,8 +13,6 @@ import (
"strconv"
"strings"
"time"
-
- "bitbucket.org/binet/go-ffi/pkg/ffi"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethdb"
@@ -27,6 +25,7 @@ import (
"gopkg.in/qml.v1"
)
+/*
func LoadExtension(path string) (uintptr, error) {
lib, err := ffi.NewLibrary(path)
if err != nil {
@@ -40,15 +39,14 @@ func LoadExtension(path string) (uintptr, error) {
ptr := so()
- /*
err = lib.Close()
if err != nil {
return 0, err
}
- */
return ptr.Interface().(uintptr), nil
}
+*/
var logger = ethlog.NewLogger("GUI")