refactor

Move RaydiumLiquidityPoolV4-related type definitions to RaydiumLiquidityPool Package

Author: 0xjeffro

solana/parser_test.go

@@ -471,7 +471,7 @@ func TestRaydiumLiquidityPoolV4Swap_0(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[4]
 
-	if swapAction, ok := action.(*types.RaydiumLiquidityPoolV4SwapAction); ok {
+	if swapAction, ok := action.(*raydiumLiquidityPoolV4.SwapAction); ok {
 		assert.Equal(t, swapAction.ProgramID, raydiumLiquidityPoolV4.Program)
 		assert.Equal(t, swapAction.ProgramName, raydiumLiquidityPoolV4.ProgramName)
 		assert.Equal(t, swapAction.InstructionName, "Swap")
@@ -496,7 +496,7 @@ func TestRaydiumLiquidityPoolV4Swap_1(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[4]
 
-	if swapAction, ok := action.(*types.RaydiumLiquidityPoolV4SwapAction); ok {
+	if swapAction, ok := action.(*raydiumLiquidityPoolV4.SwapAction); ok {
 		assert.Equal(t, swapAction.ProgramID, raydiumLiquidityPoolV4.Program)
 		assert.Equal(t, swapAction.ProgramName, raydiumLiquidityPoolV4.ProgramName)
 		assert.Equal(t, swapAction.InstructionName, "Swap")
@@ -521,7 +521,7 @@ func TestRaydiumLiquidityPoolV4Swap_2(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[3]
 
-	if swapAction, ok := action.(*types.RaydiumLiquidityPoolV4SwapAction); ok {
+	if swapAction, ok := action.(*raydiumLiquidityPoolV4.SwapAction); ok {
 		assert.Equal(t, swapAction.ProgramID, raydiumLiquidityPoolV4.Program)
 		assert.Equal(t, swapAction.ProgramName, raydiumLiquidityPoolV4.ProgramName)
 		assert.Equal(t, swapAction.InstructionName, "Swap")

solana/programs/raydiumLiquidityPoolV4/parsers/swap.go

@@ -15,7 +15,7 @@ type SwapData struct {
 	MinimumAmountOut uint64
 }
 
-func SwapParser(result *types.ParsedResult, instruction types.Instruction, instructionIdx int, decodedData []byte) (*types.RaydiumLiquidityPoolV4SwapAction, error) {
+func SwapParser(result *types.ParsedResult, instruction types.Instruction, instructionIdx int, decodedData []byte) (*raydiumLiquidityPoolV4.SwapAction, error) {
 	var swapData SwapData
 	err := borsh.Deserialize(&swapData, decodedData)
 	if err != nil {
@@ -68,7 +68,7 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, instr
 		}
 	}
 
-	action := types.RaydiumLiquidityPoolV4SwapAction{
+	action := raydiumLiquidityPoolV4.SwapAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       raydiumLiquidityPoolV4.Program,
 			ProgramName:     raydiumLiquidityPoolV4.ProgramName,

solana/types/raydiumLiquidityPoolV4Action.go renamed to solana/programs/raydiumLiquidityPoolV4/types.go

@@ -1,7 +1,9 @@
-package types
+package raydiumLiquidityPoolV4
 
-type RaydiumLiquidityPoolV4SwapAction struct {
-	BaseAction
+import "github.com/0xjeffro/tx-parser/solana/types"
+
+type SwapAction struct {
+	types.BaseAction
 	Who               string `json:"who"`
 	FromToken         string `json:"fromToken"`
 	FromTokenAmount   uint64 `json:"fromTokenAmount"`