@@ -70,7 +70,7 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
7070
7171 t . test ( 'activeHardforks()' , function ( st : tape . Test ) {
7272 let c = new Common ( 'ropsten' )
73- st . equal ( c . activeHardforks ( ) . length , 5 , 'should return 5 active hardforks for Ropsten' )
73+ st . equal ( c . activeHardforks ( ) . length , 7 , 'should return 7 active hardforks for Ropsten' )
7474 st . equal (
7575 c . activeHardforks ( ) [ 3 ] [ 'name' ] ,
7676 'spuriousDragon' ,
@@ -88,6 +88,13 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
8888 )
8989
9090 c = new Common ( 'ropsten' , null , [ 'spuriousDragon' , 'byzantium' , 'constantinople' ] )
91+ st . equal (
92+ c . activeHardforks ( null , { onlySupported : true } ) . length ,
93+ 3 ,
94+ 'should return 3 active HFs when restricted to supported HFs' ,
95+ )
96+
97+ c = new Common ( 'ropsten' , null , [ 'spuriousDragon' , 'byzantium' , 'dao' ] )
9198 st . equal (
9299 c . activeHardforks ( null , { onlySupported : true } ) . length ,
93100 2 ,
@@ -101,8 +108,8 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
101108 let c = new Common ( 'ropsten' )
102109 st . equal (
103110 c . activeHardfork ( ) ,
104- 'byzantium ' ,
105- 'should return byzantium as latest active HF for Ropsten' ,
111+ 'petersburg ' ,
112+ 'should return petersburg as latest active HF for Ropsten' ,
106113 )
107114 st . equal (
108115 c . activeHardfork ( 10 ) ,
@@ -171,11 +178,11 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
171178 'Ropsten, constantinople >= byzantium (provided) -> true' ,
172179 )
173180 st . equal (
174- c . hardforkGteHardfork ( 'constantinople ' , 'byzantium ' , {
181+ c . hardforkGteHardfork ( 'dao ' , 'chainstart ' , {
175182 onlyActive : true ,
176183 } ) ,
177184 false ,
178- 'Ropsten, constantinople >= byzantium (provided), onlyActive -> fale ' ,
185+ 'Ropsten, dao >= chainstart (provided), onlyActive -> false ' ,
179186 )
180187 st . equal (
181188 c . hardforkGteHardfork ( 'byzantium' , 'byzantium' ) ,
@@ -231,9 +238,9 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
231238 'should return false for dao (provided) on Ropsten' ,
232239 )
233240 st . equal (
234- c . hardforkIsActiveOnChain ( 'constantinople ' ) ,
235- false ,
236- 'should return false for constantinople (provided) on Ropsten' ,
241+ c . hardforkIsActiveOnChain ( 'petersburg ' ) ,
242+ true ,
243+ 'should return true for petersburg (provided) on Ropsten' ,
237244 )
238245 st . equal (
239246 c . hardforkIsActiveOnChain ( 'notexistinghardfork' ) ,
@@ -269,6 +276,7 @@ tape('[Common]: Hardfork logic', function(t: tape.Test) {
269276 st . equal ( c . consensus ( 'constantinople' ) , 'pow' , 'should return pow for constantinople consensus' )
270277 st . equal ( c . finality ( 'byzantium' ) , null , 'should return null for byzantium finality' )
271278
279+ st . comment ( '-----------------------------------------------------------------' )
272280 st . end ( )
273281 } )
274282} )
0 commit comments