roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Some log statements changed to the default logger

Browse Source
This commit is contained in:
obscuren 2014-02-24 13:50:52 +01:00
parent 6c7255cde2
commit 0afdedb01a
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ethchain/block_manager.go
View File

@ -165,37 +165,20 @@ func (bm *BlockManager) ProcessBlock(block *Block) error {
if bm.CalculateTD(block) { if bm.CalculateTD(block) {
// Sync the current block's state to the database and cancelling out the deferred Undo // Sync the current block's state to the database and cancelling out the deferred Undo
bm.bc.CurrentBlock.Sync() bm.bc.CurrentBlock.Sync()
// Add the block to the chain
bm.bc.Add(block)
/*
ethutil.Config.Db.Put(block.Hash(), block.RlpEncode())
bm.bc.CurrentBlock = block
bm.LastBlockHash = block.Hash()
bm.writeBlockInfo(block)
*/
/*
txs := bm.TransactionPool.Flush()
var coded = []interface{}{}
for _, tx := range txs {
err := bm.TransactionPool.ValidateTransaction(tx)
if err == nil {
coded = append(coded, tx.RlpEncode())
}
}
*/
// Broadcast the valid block back to the wire // Broadcast the valid block back to the wire
//bm.Speaker.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val}) //bm.Speaker.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
// Add the block to the chain
bm.bc.Add(block)
// If there's a block processor present, pass in the block for further // If there's a block processor present, pass in the block for further
// processing // processing
if bm.SecondaryBlockProcessor != nil { if bm.SecondaryBlockProcessor != nil {
bm.SecondaryBlockProcessor.ProcessBlock(block) bm.SecondaryBlockProcessor.ProcessBlock(block)
} }
log.Printf("[BMGR] Added block #%d (%x)\n", block.BlockInfo().Number, block.Hash()) ethutil.Config.Log.Infof("[BMGR] Added block #%d (%x)\n", block.BlockInfo().Number, block.Hash())
} else { } else {
fmt.Println("total diff failed") fmt.Println("total diff failed")
} }

10
ethchain/vm.go
View File

@ -48,7 +48,7 @@ func (vm *Vm) Process(contract *Contract, state *State, vars RuntimeVars) {
Pow256 := ethutil.BigPow(2, 256) Pow256 := ethutil.BigPow(2, 256)
if ethutil.Config.Debug { if ethutil.Config.Debug {
fmt.Printf("# op\n") ethutil.Config.Log.Debugf("# op\n")
} }
stepcount := 0 stepcount := 0
@ -98,7 +98,7 @@ out:
totalFee.Add(totalFee, tf) totalFee.Add(totalFee, tf)
if ethutil.Config.Debug { if ethutil.Config.Debug {
fmt.Printf("%-3d %-4s", pc, op.String()) ethutil.Config.Log.Debugf("%-3d %-4s", pc, op.String())
} }
switch op { switch op {
@ -385,12 +385,12 @@ out:
// Delete the contract // Delete the contract
state.trie.Update(string(addr), "") state.trie.Update(string(addr), "")
fmt.Printf("(%d) => %x\n", deletedMemory, recAddr) ethutil.Config.Log.Debugf("(%d) => %x\n", deletedMemory, recAddr)
break out break out
default: default:
fmt.Printf("Invalid OPCODE: %x\n", op) fmt.Printf("Invalid OPCODE: %x\n", op)
} }
fmt.Println("") ethutil.Config.Log.Debugln("")
//vm.stack.Print() //vm.stack.Print()
pc++ pc++
} }
@ -399,7 +399,7 @@ out:
} }
func makeInlineTx(addr []byte, value, from, length *big.Int, contract *Contract, state *State) { func makeInlineTx(addr []byte, value, from, length *big.Int, contract *Contract, state *State) {
fmt.Printf(" => creating inline tx %x %v %v %v", addr, value, from, length) ethutil.Config.Log.Debugf(" => creating inline tx %x %v %v %v", addr, value, from, length)
j := 0 j := 0
dataItems := make([]string, int(length.Uint64())) dataItems := make([]string, int(length.Uint64()))
for i := from.Uint64(); i < length.Uint64(); i++ { for i := from.Uint64(); i < length.Uint64(); i++ {