From fe3974d21d94db692d675787f90460ca1b9ea3ae Mon Sep 17 00:00:00 2001
From: chengwenxi <22697326+chengwenxi@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:15:12 +0800
Subject: [PATCH 1/2] use evmos swagger instead of ethermint

---
 app/app.go                 | 5 +++--
 client/docs/statik/init.go | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/app.go b/app/app.go
index 60597d89e7..2f41ce1aa2 100644
--- a/app/app.go
+++ b/app/app.go
@@ -91,8 +91,6 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
 	ibctesting "github.com/cosmos/ibc-go/v3/testing"
 
-	// unnamed import of statik for swagger UI support
-	_ "github.com/tharsis/ethermint/client/docs/statik"
 	"github.com/tharsis/ethermint/encoding"
 
 	srvflags "github.com/tharsis/ethermint/server/flags"
@@ -105,6 +103,9 @@ import (
 	feemarketkeeper "github.com/tharsis/ethermint/x/feemarket/keeper"
 	feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types"
 
+	// unnamed import of statik for swagger UI support
+	_ "github.com/tharsis/evmos/v3/client/docs/statik"
+
 	"github.com/tharsis/evmos/v3/app/ante"
 	v2 "github.com/tharsis/evmos/v3/app/upgrades/mainnet/v2"
 	v3 "github.com/tharsis/evmos/v3/app/upgrades/mainnet/v3"
diff --git a/client/docs/statik/init.go b/client/docs/statik/init.go
index 49c0d09e9d..09e1a9dd75 100644
--- a/client/docs/statik/init.go
+++ b/client/docs/statik/init.go
@@ -1,3 +1,7 @@
 package statik
 
+// unnamed import of statik for swagger UI support
+// override ethermint statik by importing it
+import _ "github.com/tharsis/ethermint/client/docs/statik"
+
 // This just for fixing the error in importing empty github.com/tharsis/ethermint/client/docs/statik

From 927b02b2d09cab69fbec849db5c4f806f29c50a1 Mon Sep 17 00:00:00 2001
From: chengwenxi <22697326+chengwenxi@users.noreply.github.com>
Date: Tue, 12 Apr 2022 18:00:38 +0800
Subject: [PATCH 2/2] ignore lint

---
 client/docs/statik/init.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/docs/statik/init.go b/client/docs/statik/init.go
index 09e1a9dd75..7879955fd7 100644
--- a/client/docs/statik/init.go
+++ b/client/docs/statik/init.go
@@ -2,6 +2,7 @@ package statik
 
 // unnamed import of statik for swagger UI support
 // override ethermint statik by importing it
+// nolint
 import _ "github.com/tharsis/ethermint/client/docs/statik"
 
 // This just for fixing the error in importing empty github.com/tharsis/ethermint/client/docs/statik