This commit is contained in:
zelig 2014-06-26 18:41:36 +01:00
parent 648c418fcd
commit ae5ace1619
8 changed files with 219 additions and 219 deletions

@ -1,13 +1,13 @@
package main package main
import ( import (
"bitbucket.org/kardianos/osext"
"flag"
"fmt" "fmt"
"github.com/ethereum/eth-go/ethlog"
"os" "os"
"os/user" "os/user"
"path" "path"
"github.com/ethereum/eth-go/ethlog"
"flag"
"bitbucket.org/kardianos/osext"
"path/filepath" "path/filepath"
"runtime" "runtime"
) )

@ -1,12 +1,12 @@
package main package main
import ( import (
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/go-ethereum/ethereal/ui" "github.com/ethereum/go-ethereum/ethereal/ui"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"github.com/ethereum/eth-go/ethlog"
"github.com/go-qml/qml" "github.com/go-qml/qml"
"runtime"
"os" "os"
"runtime"
) )
func main() { func main() {

@ -6,9 +6,9 @@ import (
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethdb" "github.com/ethereum/eth-go/ethdb"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml" "github.com/go-qml/qml"
"math/big" "math/big"

@ -3,8 +3,8 @@ package main
import ( import (
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"os"
"io/ioutil" "io/ioutil"
"os"
) )
func InitJsConsole(ethereum *eth.Ethereum) { func InitJsConsole(ethereum *eth.Ethereum) {
@ -15,7 +15,7 @@ func InitJsConsole(ethereum *eth.Ethereum) {
}) })
} }
func ExecJsFile (ethereum *eth.Ethereum, InputFile string) { func ExecJsFile(ethereum *eth.Ethereum, InputFile string) {
file, err := os.Open(InputFile) file, err := os.Open(InputFile)
if err != nil { if err != nil {
logger.Fatalln(err) logger.Fatalln(err)

@ -3,10 +3,10 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"github.com/ethereum/eth-go/ethlog"
"os" "os"
"os/user" "os/user"
"path" "path"
"github.com/ethereum/eth-go/ethlog"
) )
var Identifier string var Identifier string

@ -1,12 +1,12 @@
package main package main
import ( import (
"fmt" "fmt"
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"github.com/obscuren/otto" "github.com/obscuren/otto"
"io/ioutil" "io/ioutil"

@ -1,8 +1,8 @@
package main package main
import ( import (
"github.com/ethereum/go-ethereum/utils"
"github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/go-ethereum/utils"
"runtime" "runtime"
) )

@ -1,20 +1,20 @@
package utils package utils
import ( import (
"fmt"
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethminer" "github.com/ethereum/eth-go/ethminer"
"github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethrpc" "github.com/ethereum/eth-go/ethrpc"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethlog"
"log"
"io" "io"
"path" "log"
"os" "os"
"os/signal" "os/signal"
"fmt" "path"
"time"
"strings" "strings"
"time"
) )
var logger = ethlog.NewLogger("CLI") var logger = ethlog.NewLogger("CLI")
@ -50,7 +50,7 @@ func AbsolutePath(Datadir string, filename string) string {
return path.Join(Datadir, filename) return path.Join(Datadir, filename)
} }
func openLogFile (Datadir string, filename string) *os.File { func openLogFile(Datadir string, filename string) *os.File {
path := AbsolutePath(Datadir, filename) path := AbsolutePath(Datadir, filename)
file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil { if err != nil {
@ -59,7 +59,7 @@ func openLogFile (Datadir string, filename string) *os.File {
return file return file
} }
func confirm (message string) bool { func confirm(message string) bool {
fmt.Println(message, "Are you sure? (y/n)") fmt.Println(message, "Are you sure? (y/n)")
var r string var r string
fmt.Scanln(&r) fmt.Scanln(&r)
@ -83,7 +83,7 @@ func InitDataDir(Datadir string) {
} }
} }
func InitLogging (Datadir string, LogFile string, LogLevel int, DebugFile string) { func InitLogging(Datadir string, LogFile string, LogLevel int, DebugFile string) {
var writer io.Writer var writer io.Writer
if LogFile == "" { if LogFile == "" {
writer = os.Stdout writer = os.Stdout