resolve merge conflict

babylonlabs-io · Oct 18, 2024 · c6f54aa · c6f54aa
1 parent 169a305
commit c6f54aa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/itest/e2e_test.go b/itest/e2e_test.go
@@ -161,7 +161,7 @@ func TestFinalityProviderEditCmd(t *testing.T) {
 
 	cfg := tm.Fpa.GetConfig()
 	cfg.BabylonConfig.Key = testFpName
-	cc, err := clientcontroller.NewClientController(cfg.ChainName, cfg.BabylonConfig, &cfg.BTCNetParams, zap.NewNop())
+	cc, err := clientcontroller.NewClientController(cfg.ChainType, cfg.BabylonConfig, &cfg.BTCNetParams, zap.NewNop())
 	require.NoError(t, err)
 	tm.Fpa.UpdateClientController(cc)