hardfork test: wire advanced fork phase

Author: glyh

src/app/hardfork_test/src/internal/config/fork_method.go

@@ -10,14 +10,17 @@ type ForkMethod int
 
 const (
 	Legacy ForkMethod = iota
+	Advanced
 )
 
 var forkMethodToString = map[ForkMethod]string{
-	Legacy: "legacy",
+	Legacy:   "legacy",
+	Advanced: "advanced",
 }
 
 var stringToForkMethod = map[string]ForkMethod{
-	"legacy": Legacy,
+	"legacy":   Legacy,
+	"advanced": Advanced,
 }
 
 func (m *ForkMethod) String() string {

src/app/hardfork_test/src/internal/hardfork/phases.go

@@ -164,7 +164,7 @@ func (t *HardforkTest) LegacyForkPhase(analysis *BlockAnalysisResult, forkConfig
 }
 
 // Uses `mina advanced generate-hardfork-config CLI`
-func (t *HardforkTest) AdvancedForkPhase(analysis *BlockAnalysisResult, forkConfigBytes []byte, mainGenesisTs int64) (*ForkData, error) {
+func (t *HardforkTest) AdvancedForkPhase(analysis *BlockAnalysisResult, forkConfigBytes []byte) (*ForkData, error) {
 
 	cwd := ""
 	var err error = nil

src/app/hardfork_test/src/internal/hardfork/test.go

@@ -125,9 +125,17 @@ func (t *HardforkTest) Run() error {
 
 	t.Logger.Info("Phase 2: Forking the legacy way...")
 
-	forkData, err := t.LegacyForkPhase(analysis, forkConfigBytes, mainGenesisTs)
-	if err != nil {
-		return err
+	var forkData *ForkData
+	if t.Config.ForkMethod == config.Legacy {
+		forkData, err = t.LegacyForkPhase(analysis, forkConfigBytes, mainGenesisTs)
+		if err != nil {
+			return err
+		}
+	} else if t.Config.ForkMethod == config.Advanced {
+		forkData, err = t.AdvancedForkPhase(analysis, forkConfigBytes)
+		if err != nil {
+			return err
+		}
 	}
 
 	t.Logger.Info("Phase 3: Running fork network...")