rename: pfm- - > icq

modules/async-icq/e2e/setup.go

@@ -12,7 +12,7 @@ import (
 
 var (
 	icqRepo, icqVersion = GetDockerImageInfo()
-	PFMImage            = ibc.DockerImage{
+	ICQImage            = ibc.DockerImage{
 		Repository: icqRepo,
 		Version:    icqVersion,
 		UidGid:     "1025:1025",
@@ -23,7 +23,7 @@ var (
 		Type:           "cosmos",
 		Name:           "icq",
 		ChainID:        "icq-1",
-		Images:         []ibc.DockerImage{PFMImage},
+		Images:         []ibc.DockerImage{ICQImage},
 		Bin:            "simd",
 		Bech32Prefix:   "cosmos",
 		Denom:          Denom,

modules/async-icq/e2e/upgrade_test.go

@@ -45,7 +45,7 @@ var (
 	}
 )
 
-func TestPFMUpgrade(t *testing.T) {
+func TestICQUpgrade(t *testing.T) {
 	CosmosChainUpgradeTest(t, chainName, upgradeTo.Repository, upgradeTo.Version, upgradeName)
 }
 
@@ -108,17 +108,16 @@ func CosmosChainUpgradeTest(t *testing.T, chainName, upgradeRepo, upgradeDockerT
 	UpgradeNodes(t, ctx, chain, client, haltHeight, upgradeRepo, upgradeDockerTag)
 
 	// Validate the ICQ subspace -> keeper migration was successful.
-	// TODO: this fails now, no CLI.
 	cmd := []string{
-		chain.Config().Bin, "q", "async-icq", "params", "--output=json", "--node", chain.GetRPCAddress(),
+		chain.Config().Bin, "q", "interchainquery", "params", "--output=json", "--node", chain.GetRPCAddress(),
 	}
 	stdout, _, err := chain.Exec(ctx, cmd, nil)
 	fmt.Println("stdout", string(stdout))
-	require.NoError(t, err, "error fetching pfm params")
+	require.NoError(t, err, "error fetching icq params")
 
 	var params icqtypes.Params
 	err = json.Unmarshal(stdout, &params)
-	require.NoError(t, err, "error unmarshalling pfm params")
+	require.NoError(t, err, "error unmarshalling icq params")
 
 	t.Logf("params: %+v", params)
 	require.Equal(t, true, params.HostEnabled, "fee percentage not equal to expected value")

modules/async-icq/testing/simapp/cmd/icqd/root.go

@@ -229,7 +229,7 @@ func (ac appCreator) appExport(
 	appOpts servertypes.AppOptions,
 	modulesToExport []string,
 ) (servertypes.ExportedApp, error) {
-	var pfmApp *app.SimApp
+	var icqApp *app.SimApp
 	homePath, ok := appOpts.Get(flags.FlagHome).(string)
 	if !ok || homePath == "" {
 		return servertypes.ExportedApp{}, errors.New("application home is not set")
@@ -241,7 +241,7 @@ func (ac appCreator) appExport(
 	}
 
 	loadLatest := height == -1
-	pfmApp = app.NewSimApp(
+	icqApp = app.NewSimApp(
 		logger,
 		db,
 		traceStore,
@@ -254,10 +254,10 @@ func (ac appCreator) appExport(
 	)
 
 	if height != -1 {
-		if err := pfmApp.LoadHeight(height); err != nil {
+		if err := icqApp.LoadHeight(height); err != nil {
 			return servertypes.ExportedApp{}, err
 		}
 	}
 
-	return pfmApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport)
+	return icqApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport)
 }