fix: tests from merging main

modules/apps/transfer/types/packet_test.go

@@ -27,14 +27,6 @@ func TestFungibleTokenPacketDataValidateBasic(t *testing.T) {
 		expPass    bool
 	}{
 		{"valid packet", types.NewFungibleTokenPacketData(denom, amount, sender, receiver, ""), true},
-		{"valid packet, base denom with leading slash", types.NewFungibleTokenPacketData("transfer/channel-1/uatom/", amount, sender, receiver, ""), true},
-		{"valid packet, prefixed down with '/'", types.NewFungibleTokenPacketData("transfer/channel-1/gamm/pool/1", amount, sender, receiver, ""), true},
-		{"valid packet, no prefix", types.NewFungibleTokenPacketData("/uatom", amount, sender, receiver, ""), true},
-		{"valid packet, empty identifier prefix", types.NewFungibleTokenPacketData("//uatom", amount, sender, receiver, ""), true},
-		{"valid packet, only base denom", types.NewFungibleTokenPacketData("uatom", amount, sender, receiver, ""), true},
-		{"valid packet, base denom with single '/'", types.NewFungibleTokenPacketData("erc20/0x85bcBCd7e79Ec36f4fBBDc54F90C643d921151AA", amount, sender, receiver, ""), true},
-		{"valid packet, base denom with multiple '/'", types.NewFungibleTokenPacketData("gamm/pool/1", amount, sender, receiver, ""), true},
-		{"valid packet, single trace identifier", types.NewFungibleTokenPacketData("transfer/", amount, sender, receiver, ""), true},
 		{"valid packet with memo", types.NewFungibleTokenPacketData(denom, amount, sender, receiver, "memo"), true},
 		{"valid packet with large amount", types.NewFungibleTokenPacketData(denom, largeAmount, sender, receiver, ""), true},
 		{"invalid denom", types.NewFungibleTokenPacketData("", amount, sender, receiver, ""), false},

modules/apps/transfer/types/trace_test.go

@@ -133,10 +133,11 @@ func TestExtractDenomFromFullPath(t *testing.T) {
 		{"base denom no slashes", "atom", types.Denom{Base: "atom"}},
 		{"base denom with trailing slash", "atom/", types.Denom{Base: "atom/"}},
 		{"base denom multiple trailing slash", "foo///bar//baz/atom/", types.Denom{Base: "foo///bar//baz/atom/"}},
-		{"ibc denom one hop", "transfer/channel-0/atom", types.Denom{Base: "atom", Trace: []string{"transfer/channel-0"}}},
-		{"ibc denom one hop trailing slash", "transfer/channel-0/atom/", types.Denom{Base: "atom/", Trace: []string{"transfer/channel-0"}}},
-		{"ibc denom two hops", "transfer/channel-0/transfer/channel-60/atom", types.Denom{Base: "atom", Trace: []string{"transfer/channel-0", "transfer/channel-60"}}},
-		{"ibc denom two hops trailing slash", "transfer/channel-0/transfer/channel-60/atom/", types.Denom{Base: "atom/", Trace: []string{"transfer/channel-0", "transfer/channel-60"}}},
+		{"ibc denom one hop", "transfer/channel-0/atom", types.Denom{Base: "atom", Trace: []types.Trace{types.NewTrace("transfer", "channel-0")}}},
+		{"ibc denom one hop trailing slash", "transfer/channel-0/atom/", types.Denom{Base: "atom/", Trace: []types.Trace{types.NewTrace("transfer", "channel-0")}}},
+		{"ibc denom one hop multiple slashes", "transfer/channel-0//at/om/", types.Denom{Base: "/at/om/", Trace: []types.Trace{types.NewTrace("transfer", "channel-0")}}},
+		{"ibc denom two hops", "transfer/channel-0/transfer/channel-60/atom", types.Denom{Base: "atom", Trace: []types.Trace{types.NewTrace("transfer", "channel-0"), types.NewTrace("transfer", "channel-60")}}},
+		{"ibc denom two hops trailing slash", "transfer/channel-0/transfer/channel-60/atom/", types.Denom{Base: "atom/", Trace: []types.Trace{types.NewTrace("transfer", "channel-0"), types.NewTrace("transfer", "channel-60")}}},
 		{"empty prefix", "/uatom", types.Denom{Base: "/uatom"}},
 		{"empty identifiers", "//uatom", types.Denom{Base: "//uatom"}},
 		{"base denom with single '/'", "erc20/0x85bcBCd7e79Ec36f4fBBDc54F90C643d921151AA", types.Denom{Base: "erc20/0x85bcBCd7e79Ec36f4fBBDc54F90C643d921151AA"}},