fix: spot price for cosmwasm pools (#5950)

doggystylez · czarcas7ic · web-flow · commit 766a311d6864 · 2023-08-07T16:02:36.000+09:00
* fix spot price for cosmwasm pools

* Update CHANGELOG.md

---------

Co-authored-by: Adam Tucker &lt;adam@osmosis.team&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,8 +57,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * [#5831](https://github.com/osmosis-labs/osmosis/pull/5831) Fix superfluid_delegations query
 * [#5835](https://github.com/osmosis-labs/osmosis/pull/5835) Fix println's for "amountZeroInRemainingBigDec before fee" making it into production
-* [#5841] (https://github.com/osmosis-labs/osmosis/pull/5841) Fix protorev's out of gas erroring of the user's transcation.
-* [#5930] (https://github.com/osmosis-labs/osmosis/pull/5930) Updating Protorev Binary Search Range Logic with CL Pools
+* [#5841](https://github.com/osmosis-labs/osmosis/pull/5841) Fix protorev's out of gas erroring of the user's transcation.
+* [#5930](https://github.com/osmosis-labs/osmosis/pull/5930) Updating Protorev Binary Search Range Logic with CL Pools
+* [#5950](https://github.com/osmosis-labs/osmosis/pull/5950) fix: spot price for cosmwasm pool types
 
 ### Misc Improvements
 
diff --git a/app/apptesting/cosmwasmpool.go b/app/apptesting/cosmwasmpool.go
@@ -29,7 +29,7 @@ func (s *KeeperTestHelper) PrepareCosmWasmPool() cosmwasmpooltypes.CosmWasmExten
 	return s.PrepareCustomTransmuterPool(s.TestAccs[0], []string{DefaultTransmuterDenomA, DefaultTransmuterDenomB})
 }
 
-// PrepareCustomConcentratedPool sets up a concentrated liquidity pool with the custom parameters.
+// PrepareCustomTransmuterPool sets up a transmuter pool with the custom parameters.
 func (s *KeeperTestHelper) PrepareCustomTransmuterPool(owner sdk.AccAddress, denoms []string) cosmwasmpooltypes.CosmWasmExtension {
 	// Mint some assets to the account.
 	s.FundAcc(s.TestAccs[0], DefaultAcctFunds)
diff --git a/x/cosmwasmpool/model/pool.go b/x/cosmwasmpool/model/pool.go
@@ -71,7 +71,7 @@ func (p Pool) IsActive(ctx sdk.Context) bool {
 }
 
 // SpotPrice returns the spot price of the pool.
-func (p Pool) SpotPrice(ctx sdk.Context, baseAssetDenom string, quoteAssetDenom string) (sdk.Dec, error) {
+func (p Pool) SpotPrice(ctx sdk.Context, quoteAssetDenom string, baseAssetDenom string) (sdk.Dec, error) {
 	request := msg.SpotPriceQueryMsg{
 		SpotPrice: msg.SpotPrice{
 			QuoteAssetDenom: quoteAssetDenom,

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (s *KeeperTestHelper) PrepareCosmWasmPool() cosmwasmpooltypes.CosmWasmExten`
`29`	`29`	`return s.PrepareCustomTransmuterPool(s.TestAccs[0], []string{DefaultTransmuterDenomA, DefaultTransmuterDenomB})`
`30`	`30`	`}`
`31`	`31`
`32`		`-// PrepareCustomConcentratedPool sets up a concentrated liquidity pool with the custom parameters.`
	`32`	`+// PrepareCustomTransmuterPool sets up a transmuter pool with the custom parameters.`
`33`	`33`	`func (s *KeeperTestHelper) PrepareCustomTransmuterPool(owner sdk.AccAddress, denoms []string) cosmwasmpooltypes.CosmWasmExtension {`
`34`	`34`	`// Mint some assets to the account.`
`35`	`35`	`s.FundAcc(s.TestAccs[0], DefaultAcctFunds)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func (p Pool) IsActive(ctx sdk.Context) bool {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// SpotPrice returns the spot price of the pool.`
`74`		`-func (p Pool) SpotPrice(ctx sdk.Context, baseAssetDenom string, quoteAssetDenom string) (sdk.Dec, error) {`
	`74`	`+func (p Pool) SpotPrice(ctx sdk.Context, quoteAssetDenom string, baseAssetDenom string) (sdk.Dec, error) {`
`75`	`75`	`request := msg.SpotPriceQueryMsg{`
`76`	`76`	`SpotPrice: msg.SpotPrice{`
`77`	`77`	`QuoteAssetDenom: quoteAssetDenom,`