diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-11 00:14:31 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-11 00:14:31 +0800 |
| commit | 269cfbb8ace76ddc1f50dbd5b218c499308c8a5c (patch) | |
| tree | c2e9e274c64f431f03b9a6b8b3de22585c016027 /cmd/blocktest | |
| parent | 972e2c1e31067a9bab77228c19348b66964ce643 (diff) | |
| parent | 0542df941f57a75fa7b699089db1d9ae40e4ff71 (diff) | |
| download | dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.gz dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.bz2 dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.lz dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.xz dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.zst dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.zip | |
Merge branch origin/develop into accounts-integration
Conflicts:
cmd/blocktest/main.go
cmd/mist/debugger.go
cmd/utils/cmd.go
Diffstat (limited to 'cmd/blocktest')
| -rw-r--r-- | cmd/blocktest/main.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/blocktest/main.go b/cmd/blocktest/main.go index d9d97abc9..ec2779e2e 100644 --- a/cmd/blocktest/main.go +++ b/cmd/blocktest/main.go @@ -187,6 +187,9 @@ func loadBlocksFromTestFile(filePath string) (blocks types.Blocks, err error) { } gb := types.NewBlockWithHeader(gbh) + //gb.uncles = *new([]*types.Header) + //gb.transactions = *new(types.Transactions) + gb.Td = new(big.Int) gb.Reward = new(big.Int) testBlock := new(types.Block) |