From d1560d16e882bf7cf6b2ed04e4bda24945295145 Mon Sep 17 00:00:00 2001
From: jay tseng <jay.tseng@crypto.com>
Date: Tue, 8 Mar 2022 13:57:05 -0500
Subject: [PATCH] fix rebase conflict

---
 node/node.go      | 2 +-
 node/node_test.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/node/node.go b/node/node.go
index 9ee019c45..ab4d9e394 100644
--- a/node/node.go
+++ b/node/node.go
@@ -165,7 +165,7 @@ func makeNode(
 	}
 
 	// Check app version is matched with the genesis file.
-	appInfo, err := proxyApp.Query().Info(ctx, abci.RequestInfo{Version: ""})
+	appInfo, err := proxyApp.Info(ctx, abci.RequestInfo{Version: ""})
 	if err != nil {
 		return nil, fmt.Errorf("error query app info: %w", err)
 	}
diff --git a/node/node_test.go b/node/node_test.go
index 17cfc784b..36c8f36b9 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -773,7 +773,8 @@ func TestNodeAppVersionNotMatched(t *testing.T) {
 
 	logger := log.NewNopLogger()
 
-	appClient, _ := proxy.DefaultClientCreator(logger, cfg.ProxyApp, cfg.ABCI, cfg.DBDir())
+	appClient, _, err := proxy.ClientFactory(logger, cfg.ProxyApp, cfg.ABCI, cfg.DBDir())
+	require.NoError(t, err)
 
 	genesisDoc, err := types.GenesisDocFromFile(cfg.GenesisFile())
 	require.NoError(t, err)