fix: return whirlpool oracle

seabed-labs · Apr 22, 2023 · a1a7e7a · a1a7e7a
1 parent f76a2d7
commit a1a7e7a
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 68 deletions.
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -1002,6 +1002,7 @@ components:
             - whirlpool
             - tokenVaultA
             - tokenVaultB
+            - oracle
 
           properties:
             whirlpool:
@@ -1013,6 +1014,9 @@ components:
             tokenVaultB:
               type: string
               example: "2wMQTELEgEcK7V3gwZBH58WvGcRZsyaWNpebqyFugGKe"
+            oracle:
+              type: string
+              example: "HtXk9cvY5isaeVawiaTFUrM6AH31g2Xbrq9qVQRvJVdL"
 
     tokenAccount:
       type: object

diff --git a/pkg/api/apispec/generated.go b/pkg/api/apispec/generated.go
diff --git a/pkg/api/routes/utils.go b/pkg/api/routes/utils.go
@@ -183,6 +183,7 @@ func vaultTokenSwapToAPI(vault *model.Vault, tokenSwap *model.TokenSwap) apispec
 
 func vaultWhirlpoolToAPI(vault *model.Vault, orcaWhirlpool *model.OrcaWhirlpool) apispec.OrcaWhirlpoolConfig {
 	return apispec.OrcaWhirlpoolConfig{
+		Oracle:      orcaWhirlpool.Oracle,
 		TokenVaultA: orcaWhirlpool.TokenVaultA,
 		TokenVaultB: orcaWhirlpool.TokenVaultB,
 		Whirlpool:   orcaWhirlpool.Pubkey,

diff --git a/pkg/api/routes/utils_test.go b/pkg/api/routes/utils_test.go
@@ -337,8 +337,9 @@ func TestUtils(t *testing.T) {
 		assert.Equal(t, orcaWhirlpool.Pubkey, apiModel.Whirlpool)
 		assert.Equal(t, orcaWhirlpool.TokenVaultA, apiModel.TokenVaultA)
 		assert.Equal(t, orcaWhirlpool.TokenVaultB, apiModel.TokenVaultB)
+		assert.Equal(t, orcaWhirlpool.Oracle, apiModel.Oracle)
 		// if the line below needs to be updated, add the field assertion above
-		assert.Equal(t, reflect.TypeOf(apiModel).NumField(), 4)
+		assert.Equal(t, reflect.TypeOf(apiModel).NumField(), 5)
 
 		assert.Equal(t, vault.TokenAMint, apiModel.TokenAMint)
 		assert.Equal(t, vault.TokenBMint, apiModel.TokenBMint)