OSDN Git Service
(root)
/
bytom
/
vapor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add mac function, modify nextBlockTime (#122)
[bytom/vapor.git]
/
test
/
block_test_util.go
diff --git
a/test/block_test_util.go
b/test/block_test_util.go
index
6915653
..
890d680
100644
(file)
--- a/
test/block_test_util.go
+++ b/
test/block_test_util.go
@@
-19,7
+19,6
@@
func NewBlock(chain *protocol.Chain, txs []*types.Tx, controlProgram []byte) (*t
}
preBlockHeader := chain.BestBlockHeader()
}
preBlockHeader := chain.BestBlockHeader()
-
b := &types.Block{
BlockHeader: types.BlockHeader{
Version: 1,
b := &types.Block{
BlockHeader: types.BlockHeader{
Version: 1,
@@
-84,15
+83,9
@@
func AppendBlocks(chain *protocol.Chain, num uint64) error {
if err != nil {
return err
}
if err != nil {
return err
}
- if
err := SolveAndUpdate(chain,
block); err != nil {
+ if
_, err := chain.ProcessBlock(
block); err != nil {
return err
}
}
return nil
}
return err
}
}
return nil
}
-
-// SolveAndUpdate solve difficulty and update chain status
-func SolveAndUpdate(chain *protocol.Chain, block *types.Block) error {
- _, err := chain.ProcessBlock(block)
- return err
-}