Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
09c7d158
Commit
09c7d158
authored
Aug 22, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Error window
parent
9131a7c6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
67 additions
and
4 deletions
+67
-4
README.md
README.md
+1
-1
errors.go
ethereal/errors.go
+36
-0
main.go
ethereal/main.go
+19
-1
main.go
ethereum/main.go
+1
-1
cmd.go
utils/cmd.go
+10
-1
No files found.
README.md
View file @
09c7d158
...
...
@@ -7,7 +7,7 @@ Status](http://cpt-obvious.ethercasts.com:8010/buildstatusimage?builder=go-ether
Ethereum Go Client © 2014 Jeffrey Wilcke.
Current state: Proof of Concept 0.6.
4
.
Current state: Proof of Concept 0.6.
5
.
For the development package please see the
[
eth-go package
](
https://github.com/ethereum/eth-go
)
.
...
...
ethereal/errors.go
0 → 100644
View file @
09c7d158
package
main
import
(
"fmt"
"os"
"gopkg.in/qml.v1"
)
func
ErrorWindow
(
err
error
)
{
engine
:=
qml
.
NewEngine
()
component
,
e
:=
engine
.
LoadString
(
"local"
,
qmlErr
)
if
e
!=
nil
{
fmt
.
Println
(
"err:"
,
err
)
os
.
Exit
(
1
)
}
win
:=
component
.
CreateWindow
(
nil
)
win
.
Root
()
.
ObjectByName
(
"label"
)
.
Set
(
"text"
,
err
.
Error
())
win
.
Show
()
win
.
Wait
()
}
const
qmlErr
=
`
import QtQuick 2.0; import QtQuick.Controls 1.0;
ApplicationWindow {
width: 600; height: 150;
flags: Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint
title: "Error"
Text {
x: parent.width / 2 - this.width / 2;
y: parent.height / 2 - this.height / 2;
objectName: "label";
}
}
`
ethereal/main.go
View file @
09c7d158
package
main
import
(
"fmt"
"os"
"runtime"
...
...
@@ -12,7 +13,7 @@ import (
const
(
ClientIdentifier
=
"Ethereal"
Version
=
"0.6.
4
"
Version
=
"0.6.
5
"
)
var
ethereum
*
eth
.
Ethereum
...
...
@@ -28,6 +29,23 @@ func run() error {
utils
.
InitLogging
(
Datadir
,
LogFile
,
LogLevel
,
DebugFile
)
db
:=
utils
.
NewDatabase
()
err
:=
utils
.
DBSanityCheck
(
db
)
if
err
!=
nil
{
engine
:=
qml
.
NewEngine
()
component
,
e
:=
engine
.
LoadString
(
"local"
,
qmlErr
)
if
e
!=
nil
{
fmt
.
Println
(
"err:"
,
err
)
os
.
Exit
(
1
)
}
win
:=
component
.
CreateWindow
(
nil
)
win
.
Root
()
.
ObjectByName
(
"label"
)
.
Set
(
"text"
,
err
.
Error
())
win
.
Show
()
win
.
Wait
()
ErrorWindow
(
err
)
os
.
Exit
(
1
)
}
keyManager
:=
utils
.
NewKeyManager
(
KeyStore
,
Datadir
,
db
)
...
...
ethereum/main.go
View file @
09c7d158
...
...
@@ -13,7 +13,7 @@ import (
const
(
ClientIdentifier
=
"Ethereum(G)"
Version
=
"0.6.
4
"
Version
=
"0.6.
5
"
)
var
logger
=
ethlog
.
NewLogger
(
"CLI"
)
...
...
utils/cmd.go
View file @
09c7d158
...
...
@@ -80,6 +80,16 @@ func confirm(message string) bool {
return
r
==
"y"
}
func
DBSanityCheck
(
db
ethutil
.
Database
)
error
{
d
,
_
:=
db
.
Get
([]
byte
(
"ProtocolVersion"
))
protov
:=
ethutil
.
NewValue
(
d
)
.
Uint
()
if
protov
!=
eth
.
ProtocolVersion
&&
protov
!=
0
{
return
fmt
.
Errorf
(
"Database version mismatch. Protocol(%d / %d). `rm -rf %s`"
,
protov
,
eth
.
ProtocolVersion
,
ethutil
.
Config
.
ExecPath
+
"/database"
)
}
return
nil
}
func
InitDataDir
(
Datadir
string
)
{
_
,
err
:=
os
.
Stat
(
Datadir
)
if
err
!=
nil
{
...
...
@@ -112,7 +122,6 @@ func InitConfig(ConfigFile string, Datadir string, EnvPrefix string) *ethutil.Co
func
exit
(
err
error
)
{
status
:=
0
if
err
!=
nil
{
fmt
.
Println
(
err
)
logger
.
Errorln
(
"Fatal: "
,
err
)
status
=
1
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment