feat: return oracle config in list drip config endpoints

seabed-labs · Dec 12, 2022 · be8e328 · be8e328
1 parent 99ba1f1
commit be8e328
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 73 deletions.
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -947,6 +947,9 @@ components:
         tokenBMint:
           type: string
           example: "5r23oKMycxnnjAJ4cEEkh1bbCowcZwzL6HYmhLqRazQa"
+        oracleConfig:
+          type: string
+          example: "5r23oKMycxnnjAJ4cEEkh1bbCowcZwzL6HYmhLqRazQa"
 
     splTokenSwapConfig:
       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
@@ -179,6 +179,7 @@ func vaultTokenSwapToAPI(vault *model.Vault, tokenSwap *model.TokenSwap) apispec
 			VaultProtoConfig:   vault.ProtoConfig,
 			VaultTokenAAccount: vault.TokenAAccount,
 			VaultTokenBAccount: vault.TokenBAccount,
+			OracleConfig:       vault.OracleConfig,
 		},
 	}
 }
@@ -196,6 +197,7 @@ func vaultWhirlpoolToAPI(vault *model.Vault, orcaWhirlpool *model.OrcaWhirlpool)
 			VaultProtoConfig:   vault.ProtoConfig,
 			VaultTokenAAccount: vault.TokenAAccount,
 			VaultTokenBAccount: vault.TokenBAccount,
+			OracleConfig:       vault.OracleConfig,
 		},
 	}
 }

diff --git a/pkg/api/routes/utils_test.go b/pkg/api/routes/utils_test.go
@@ -263,6 +263,7 @@ func TestUtils(t *testing.T) {
 			MaxSlippageBps:         50,
 			TokenAMint:             solana.NewWallet().PublicKey().String(),
 			TokenBMint:             solana.NewWallet().PublicKey().String(),
+			OracleConfig:           utils.GetStringPtr(solana.NewWallet().PublicKey().String()),
 		}
 		tokenSwap := model.TokenSwap{
 			Pubkey:        solana.NewWallet().PublicKey().String(),
@@ -293,8 +294,9 @@ func TestUtils(t *testing.T) {
 		assert.Equal(t, vault.ProtoConfig, apiModel.VaultProtoConfig)
 		assert.Equal(t, vault.TokenAAccount, apiModel.DripCommon.VaultTokenAAccount)
 		assert.Equal(t, vault.TokenBAccount, apiModel.DripCommon.VaultTokenBAccount)
+		assert.Equal(t, *vault.OracleConfig, *apiModel.OracleConfig)
 		// if the line below needs to be updated, add the field assertion above
-		assert.Equal(t, reflect.TypeOf(apiModel.DripCommon).NumField(), 6)
+		assert.Equal(t, reflect.TypeOf(apiModel.DripCommon).NumField(), 7)
 	})
 
 	t.Run("vaultWhirlpoolToAPI should return correct apiSpec model", func(t *testing.T) {
@@ -312,6 +314,7 @@ func TestUtils(t *testing.T) {
 			MaxSlippageBps:         50,
 			TokenAMint:             solana.NewWallet().PublicKey().String(),
 			TokenBMint:             solana.NewWallet().PublicKey().String(),
+			OracleConfig:           utils.GetStringPtr(solana.NewWallet().PublicKey().String()),
 		}
 		orcaWhirlpool := model.OrcaWhirlpool{
 			Pubkey:                     solana.NewWallet().PublicKey().String(),
@@ -350,8 +353,9 @@ func TestUtils(t *testing.T) {
 		assert.Equal(t, vault.ProtoConfig, apiModel.VaultProtoConfig)
 		assert.Equal(t, vault.TokenAAccount, apiModel.DripCommon.VaultTokenAAccount)
 		assert.Equal(t, vault.TokenBAccount, apiModel.DripCommon.VaultTokenBAccount)
+		assert.Equal(t, *vault.OracleConfig, *apiModel.OracleConfig)
 		// if the line below needs to be updated, add the field assertion above
-		assert.Equal(t, reflect.TypeOf(apiModel.DripCommon).NumField(), 6)
+		assert.Equal(t, reflect.TypeOf(apiModel.DripCommon).NumField(), 7)
 	})
 
 }