Commit Graph

37 Commits

Author SHA1 Message Date
Danny Ryan 27c8e41b32
Merge branch 'dev' into JustinDrake-patch-14 2019-05-13 16:29:29 -04:00
Justin 9eeca0cdbd
Merge branch 'dev' into JustinDrake-patch-14 2019-05-07 10:16:38 +01:00
Justin Drake ea60fb632c More renaming 2019-05-06 20:49:46 +01:00
Justin Drake f4db9ebae0 Renamings triggered by HW comment 2019-05-06 18:26:14 +01:00
Justin Drake 197a7200ef Add HW and Danny comments 2019-05-03 21:21:42 +01:00
Justin Drake 5df79d7565 Get rid of state_transition.py 2019-05-01 13:14:10 +01:00
Hsiao-Wei Wang 5f341ae493
Move `get_state_root` to `pyspec/tests/helpers.py` 2019-05-01 17:06:02 +08:00
Justin Drake b6b4d3cbaf Add get_state_root in tests 2019-05-01 09:30:08 +01:00
Danny Ryan bd50960740
tiny fix to test ouptut 2019-04-24 13:20:55 -06:00
Danny Ryan 2b999a6c7e
fix off by one error for eth1 data voting 2019-04-24 13:15:06 -06:00
Danny Ryan 11985b7b22
Merge branch 'dev' into finality-testing 2019-04-24 11:54:10 -06:00
Danny Ryan 20d65e040b
pr feedback 2019-04-24 11:31:24 -06:00
Hsiao-Wei Wang 9c2fa02658
Update test_libs/pyspec/tests/test_sanity.py
Co-Authored-By: JustinDrake <drakefjustin@gmail.com>
2019-04-24 20:54:39 +10:00
Justin Drake 55f042aa71 More fixes 2019-04-24 15:17:25 +10:00
Justin de01ffd38d
Merge branch 'dev' into JustinDrake-patch-14 2019-04-24 14:35:02 +10:00
Danny Ryan 5587c44abe
Update test_libs/pyspec/tests/test_sanity.py
Co-Authored-By: JustinDrake <drakefjustin@gmail.com>
2019-04-24 14:29:35 +10:00
Danny Ryan bd0552c796
fix finality tests for each rule 2019-04-23 13:32:41 -06:00
Danny Ryan 23c9b8b2d1
Merge branch 'dev-master-conflicts' into finality-testing 2019-04-23 12:46:52 -06:00
Danny Ryan d97447272f
Merge branch 'master' into dev-master-conflicts 2019-04-23 12:43:00 -06:00
Carl Beekhuizen fe01b6f231
Merges dev into carl-patch-1 2019-04-23 13:39:19 +02:00
Danny Ryan e13cec1466
increase MAX_TRANSFERS for transfer test 2019-04-22 10:02:31 -06:00
Danny Ryan 0079c635b6
Merge pull request #924 from ethereum/JustinDrake-patch-11
Remove serialization from consensus
2019-04-22 09:41:30 -06:00
Justin d067a9fcf2
Merge branch 'dev' into JustinDrake-patch-14 2019-04-20 15:19:21 +10:00
Justin Drake f908c8d3e0 Revamped balances and incentivisation 2019-04-20 15:17:33 +10:00
Justin 39d0822602
Sane SSZ object default values (#963) 2019-04-19 18:26:54 +10:00
Hsiao-Wei Wang 408ef7e6eb
Merge branch 'dev' into carl-patch-1 2019-04-19 14:50:48 +08:00
Danny Ryan 523800819b
Merge branch 'dev' into vbuterin-patch-2 2019-04-18 21:17:29 -06:00
Danny Ryan 9f4e59b0bc
enhance finality testing -- case 1, 2, 4 2019-04-18 18:33:06 -06:00
Carl Beekhuizen 26afa077fd Resolves conflicts and merges in dev 2019-04-18 23:17:53 +02:00
Danny Ryan faa6a46f15
Merge branch 'dev' into JustinDrake-patch-11 2019-04-18 11:45:45 -06:00
Carl Beekhuizen cb5c95b84e Fixes tests 2019-04-18 12:35:22 +02:00
Justin 6975288254
Merge branch 'dev' into carl-patch-1 2019-04-18 17:52:56 +10:00
Danny Ryan 8c5f7a571d
Merge branch 'dev' into prev-cur-crosslinks 2019-04-17 20:27:25 -06:00
Danny Ryan d118eb03c9
Merge branch 'dev' into carl-patch-1 2019-04-17 11:18:29 -06:00
Danny Ryan 2cb8f1c520
Merge branch 'dev' into start-at-zero 2019-04-17 08:39:25 -06:00
Danny Ryan ef14396532
Merge branch 'dev' into prev-cur-crosslinks 2019-04-17 08:33:13 -06:00
protolambda 90cf8738bf
Move pytests for faster dev iteration 2019-04-17 17:47:56 +10:00