update tests, rm empty base denom in trace.go

cosmos · Jul 20, 2022 · b608e89 · b608e89
1 parent 96aabb5
commit b608e89
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/modules/apps/transfer/keeper/migrations.go b/modules/apps/transfer/keeper/migrations.go
@@ -31,8 +31,7 @@ func (m Migrator) MigrateTraces(ctx sdk.Context) error {
 			newTrace := types.ParseDenomTrace(dt.GetFullDenomPath())
 			err := newTrace.Validate()
 			if err != nil {
-				iterErr = err
-				return true
+				panic(err)
 			}
 			if !equalTraces(newTrace, dt) {
 				newTraces = append(newTraces, newTrace)

diff --git a/modules/apps/transfer/keeper/migrations_test.go b/modules/apps/transfer/keeper/migrations_test.go
@@ -21,7 +21,7 @@ func (suite *KeeperTestSuite) TestMigratorMigrateTraces() {
 				suite.chainA.GetSimApp().TransferKeeper.SetDenomTrace(
 					suite.chainA.GetContext(),
 					transfertypes.DenomTrace{
-						BaseDenom: "1", Path: "transfer/channel-0/gamm/pool",
+						BaseDenom: "pool/1", Path: "transfer/channel-0/gamm",
 					})
 			},
 			transfertypes.Traces{
@@ -36,7 +36,7 @@ func (suite *KeeperTestSuite) TestMigratorMigrateTraces() {
 				suite.chainA.GetSimApp().TransferKeeper.SetDenomTrace(
 					suite.chainA.GetContext(),
 					transfertypes.DenomTrace{
-						BaseDenom: "", Path: "transfer/channel-149/erc/0x85bcBCd7e79Ec36f4fBBDc54F90C643d921151AA",
+						BaseDenom: "0x85bcBCd7e79Ec36f4fBBDc54F90C643d921151AA", Path: "transfer/channel-149/erc",
 					})
 			},
 			transfertypes.Traces{

diff --git a/modules/apps/transfer/types/trace.go b/modules/apps/transfer/types/trace.go
@@ -71,9 +71,6 @@ func (dt DenomTrace) GetFullDenomPath() string {
 	if dt.Path == "" {
 		return dt.BaseDenom
 	}
-	if dt.BaseDenom == "" {
-		return dt.Path
-	}
 	return dt.GetPrefix() + dt.BaseDenom
 }