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
853053a3
Commit
853053a3
authored
Jun 26, 2014
by
zelig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
go fmt
parent
da38faa8
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
204 additions
and
205 deletions
+204
-205
block_chain.go
ethchain/block_chain.go
+1
-1
dagger.go
ethchain/dagger.go
+1
-2
state_manager.go
ethchain/state_manager.go
+1
-1
transaction_pool.go
ethchain/transaction_pool.go
+1
-1
vm.go
ethchain/vm.go
+1
-1
ethereum.go
ethereum.go
+1
-1
loggers.go
ethlog/loggers.go
+101
-101
loggers_test.go
ethlog/loggers_test.go
+72
-78
miner.go
ethminer/miner.go
+8
-2
pub.go
ethpub/pub.go
+1
-1
server.go
ethrpc/server.go
+1
-1
config.go
ethutil/config.go
+13
-13
encoding_test.go
ethutil/encoding_test.go
+1
-1
peer.go
peer.go
+1
-1
No files found.
ethchain/block_chain.go
View file @
853053a3
...
...
@@ -2,9 +2,9 @@ package ethchain
import
(
"bytes"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/eth-go/ethlog"
"math"
"math/big"
)
...
...
ethchain/dagger.go
View file @
853053a3
package
ethchain
import
(
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"github.com/obscuren/sha3"
"hash"
"math/big"
...
...
@@ -31,7 +31,6 @@ func (pow *EasyPow) Search(block *Block, reactChan chan ethutil.React) []byte {
for
{
select
{
case
<-
reactChan
:
//powlogger.Infoln("Received reactor event; breaking out.")
return
nil
default
:
i
++
...
...
ethchain/state_manager.go
View file @
853053a3
...
...
@@ -3,9 +3,9 @@ package ethchain
import
(
"bytes"
"container/list"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/eth-go/ethlog"
"math/big"
"sync"
"time"
...
...
ethchain/transaction_pool.go
View file @
853053a3
...
...
@@ -4,8 +4,8 @@ import (
"bytes"
"container/list"
"fmt"
"github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethwire"
"math/big"
"sync"
)
...
...
ethchain/vm.go
View file @
853053a3
...
...
@@ -2,8 +2,8 @@ package ethchain
import
(
"fmt"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"math"
"math/big"
)
...
...
ethereum.go
View file @
853053a3
...
...
@@ -5,10 +5,10 @@ import (
"fmt"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethdb"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethrpc"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/eth-go/ethlog"
"io/ioutil"
"math/rand"
"net"
...
...
ethlog/loggers.go
View file @
853053a3
...
...
@@ -2,10 +2,10 @@ package ethlog
import
(
"fmt"
"sync"
"log"
"io"
"log"
"os"
"sync"
)
type
LogSystem
interface
{
...
...
@@ -21,11 +21,11 @@ type logMessage struct {
msg
string
}
func
newPrintlnLogMessage
(
level
LogLevel
,
tag
string
,
v
...
interface
{})
*
logMessage
{
func
newPrintlnLogMessage
(
level
LogLevel
,
tag
string
,
v
...
interface
{})
*
logMessage
{
return
&
logMessage
{
level
,
false
,
fmt
.
Sprintf
(
"[%s] %s"
,
tag
,
fmt
.
Sprint
(
v
...
))}
}
func
newPrintfLogMessage
(
level
LogLevel
,
tag
string
,
format
string
,
v
...
interface
{})
*
logMessage
{
func
newPrintfLogMessage
(
level
LogLevel
,
tag
string
,
format
string
,
v
...
interface
{})
*
logMessage
{
return
&
logMessage
{
level
,
true
,
fmt
.
Sprintf
(
"[%s] %s"
,
tag
,
fmt
.
Sprintf
(
format
,
v
...
))}
}
...
...
@@ -37,7 +37,7 @@ func (msg *logMessage) send(logger LogSystem) {
}
}
var
logMessages
chan
(
*
logMessage
)
var
logMessages
chan
(
*
logMessage
)
var
logSystems
[]
LogSystem
var
drained
=
true
...
...
@@ -56,7 +56,7 @@ const (
func
start
()
{
for
{
select
{
case
msg
:=
<-
logMessages
:
case
msg
:=
<-
logMessages
:
for
_
,
logSystem
:=
range
logSystems
{
if
logSystem
.
GetLogLevel
()
>=
msg
.
LogLevel
{
msg
.
send
(
logSystem
)
...
...
@@ -70,7 +70,8 @@ func start() {
// waits until log messages are drained (dispatched to log writers)
func
Flush
()
{
for
!
drained
{}
for
!
drained
{
}
}
type
Logger
struct
{
...
...
@@ -92,7 +93,7 @@ func AddLogSystem(logSystem LogSystem) {
logSystems
=
append
(
logSystems
,
logSystem
)
}
func
(
logger
*
Logger
)
sendln
(
level
LogLevel
,
v
...
interface
{})
{
func
(
logger
*
Logger
)
sendln
(
level
LogLevel
,
v
...
interface
{})
{
if
logMessages
!=
nil
{
msg
:=
newPrintlnLogMessage
(
level
,
logger
.
tag
,
v
...
)
drained
=
false
...
...
@@ -100,7 +101,7 @@ func (logger *Logger) sendln(level LogLevel, v...interface{}) {
}
}
func
(
logger
*
Logger
)
sendf
(
level
LogLevel
,
format
string
,
v
...
interface
{})
{
func
(
logger
*
Logger
)
sendf
(
level
LogLevel
,
format
string
,
v
...
interface
{})
{
if
logMessages
!=
nil
{
msg
:=
newPrintfLogMessage
(
level
,
logger
.
tag
,
format
,
v
...
)
drained
=
false
...
...
@@ -108,53 +109,53 @@ func (logger *Logger) sendf(level LogLevel, format string, v...interface{}) {
}
}
func
(
logger
*
Logger
)
Errorln
(
v
...
interface
{})
{
func
(
logger
*
Logger
)
Errorln
(
v
...
interface
{})
{
logger
.
sendln
(
ErrorLevel
,
v
...
)
}
func
(
logger
*
Logger
)
Warnln
(
v
...
interface
{})
{
func
(
logger
*
Logger
)
Warnln
(
v
...
interface
{})
{
logger
.
sendln
(
WarnLevel
,
v
...
)
}
func
(
logger
*
Logger
)
Infoln
(
v
...
interface
{})
{
func
(
logger
*
Logger
)
Infoln
(
v
...
interface
{})
{
logger
.
sendln
(
InfoLevel
,
v
...
)
}
func
(
logger
*
Logger
)
Debugln
(
v
...
interface
{})
{
func
(
logger
*
Logger
)
Debugln
(
v
...
interface
{})
{
logger
.
sendln
(
DebugLevel
,
v
...
)
}
func
(
logger
*
Logger
)
DebugDetailln
(
v
...
interface
{})
{
func
(
logger
*
Logger
)
DebugDetailln
(
v
...
interface
{})
{
logger
.
sendln
(
DebugDetailLevel
,
v
...
)
}
func
(
logger
*
Logger
)
Errorf
(
format
string
,
v
...
interface
{})
{
func
(
logger
*
Logger
)
Errorf
(
format
string
,
v
...
interface
{})
{
logger
.
sendf
(
ErrorLevel
,
format
,
v
...
)
}
func
(
logger
*
Logger
)
Warnf
(
format
string
,
v
...
interface
{})
{
func
(
logger
*
Logger
)
Warnf
(
format
string
,
v
...
interface
{})
{
logger
.
sendf
(
WarnLevel
,
format
,
v
...
)
}
func
(
logger
*
Logger
)
Infof
(
format
string
,
v
...
interface
{})
{
func
(
logger
*
Logger
)
Infof
(
format
string
,
v
...
interface
{})
{
logger
.
sendf
(
InfoLevel
,
format
,
v
...
)
}
func
(
logger
*
Logger
)
Debugf
(
format
string
,
v
...
interface
{})
{
func
(
logger
*
Logger
)
Debugf
(
format
string
,
v
...
interface
{})
{
logger
.
sendf
(
DebugLevel
,
format
,
v
...
)
}
func
(
logger
*
Logger
)
DebugDetailf
(
format
string
,
v
...
interface
{})
{
func
(
logger
*
Logger
)
DebugDetailf
(
format
string
,
v
...
interface
{})
{
logger
.
sendf
(
DebugDetailLevel
,
format
,
v
...
)
}
func
(
logger
*
Logger
)
Fatalln
(
v
...
interface
{})
{
func
(
logger
*
Logger
)
Fatalln
(
v
...
interface
{})
{
logger
.
sendln
(
ErrorLevel
,
v
...
)
Flush
()
os
.
Exit
(
0
)
}
func
(
logger
*
Logger
)
Fatalf
(
format
string
,
v
...
interface
{})
{
func
(
logger
*
Logger
)
Fatalf
(
format
string
,
v
...
interface
{})
{
logger
.
sendf
(
ErrorLevel
,
format
,
v
...
)
Flush
()
os
.
Exit
(
0
)
...
...
@@ -185,4 +186,3 @@ func NewStdLogSystem(writer io.Writer, flags int, level LogLevel) *StdLogSystem
logger
:=
log
.
New
(
writer
,
""
,
flags
)
return
&
StdLogSystem
{
logger
,
level
}
}
ethlog/loggers_test.go
View file @
853053a3
package
ethlog
import
(
"testing"
"fmt"
"io/ioutil"
"os"
"testing"
)
type
TestLogSystem
struct
{
...
...
@@ -107,9 +107,3 @@ func TestNoLogSystem(t *testing.T) {
logger
.
Warnln
(
"warn"
)
Flush
()
}
ethminer/miner.go
View file @
853053a3
...
...
@@ -3,9 +3,9 @@ package ethminer
import
(
"bytes"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/eth-go/ethlog"
"sort"
)
...
...
@@ -57,18 +57,23 @@ func NewDefaultMiner(coinbase []byte, ethereum ethchain.EthManager) Miner {
return
miner
}
func
(
miner
*
Miner
)
Start
()
{
// Prepare inital block
//miner.ethereum.StateManager().Prepare(miner.block.State(), miner.block.State())
go
miner
.
listener
()
logger
.
Infoln
(
"Started"
)
}
func
(
miner
*
Miner
)
listener
()
{
out
:
for
{
select
{
case
<-
miner
.
quitChan
:
logger
.
Infoln
(
"Stopped"
)
break
out
case
chanMessage
:=
<-
miner
.
reactChan
:
if
block
,
ok
:=
chanMessage
.
Resource
.
(
*
ethchain
.
Block
);
ok
{
//logger.Infoln("Got new block via Reactor")
if
bytes
.
Compare
(
miner
.
ethereum
.
BlockChain
()
.
CurrentBlock
.
Hash
(),
block
.
Hash
())
==
0
{
...
...
@@ -123,8 +128,9 @@ out:
}
func
(
self
*
Miner
)
Stop
()
{
self
.
powQuitChan
<-
ethutil
.
React
{}
logger
.
Infoln
(
"Stopping..."
)
self
.
quitChan
<-
true
self
.
powQuitChan
<-
ethutil
.
React
{}
}
func
(
self
*
Miner
)
mineNewBlock
()
{
...
...
ethpub/pub.go
View file @
853053a3
...
...
@@ -5,8 +5,8 @@ import (
"encoding/hex"
"encoding/json"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"math/big"
"strings"
"sync/atomic"
...
...
ethrpc/server.go
View file @
853053a3
...
...
@@ -2,8 +2,8 @@ package ethrpc
import
(
"fmt"
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethpub"
"net"
"net/rpc"
"net/rpc/jsonrpc"
...
...
ethutil/config.go
View file @
853053a3
...
...
@@ -4,8 +4,8 @@ import (
"flag"
"fmt"
"github.com/rakyll/globalconf"
"runtime"
"os"
"runtime"
)
// Config struct
...
...
ethutil/encoding_test.go
View file @
853053a3
peer.go
View file @
853053a3
...
...
@@ -5,9 +5,9 @@ import (
"container/list"
"fmt"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/eth-go/ethlog"
"net"
"strconv"
"strings"
...
...
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