Skip to content

Commit 46537c1

Browse files
0xjeffro0xjeffro
committed
refactor
1 parent e5e6af9 commit 46537c1

File tree

8 files changed

+44
-44
lines changed

8 files changed

+44
-44
lines changed

‎solana/parser_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package solana
22

33
import (
44
"fmt"
5-
"github.com/0xjeffro/tx-parser/solana/programs/OKXDEXAggregationRouterV2"
65
"github.com/0xjeffro/tx-parser/solana/programs/jupiter_aggregator_v6"
6+
"github.com/0xjeffro/tx-parser/solana/programs/okx_dex_aggregation_router_v2"
77
"io/ioutil"
88
"os"
99
"testing"
@@ -635,9 +635,9 @@ func TestOKXDEXCommissionSplProxySwap_1(t *testing.T) {
635635
results, _ := Parser(byteValue)
636636
action := results[0].Actions[3]
637637

638-
if swapAction, ok := action.(*OKXDEXAggregationRouterV2.CommissionSplProxySwapAction); ok {
639-
assert.Equal(t, swapAction.ProgramID, OKXDEXAggregationRouterV2.Program)
640-
assert.Equal(t, swapAction.ProgramName, OKXDEXAggregationRouterV2.ProgramName)
638+
if swapAction, ok := action.(*okx_dex_aggregation_router_v2.CommissionSplProxySwapAction); ok {
639+
assert.Equal(t, swapAction.ProgramID, okx_dex_aggregation_router_v2.Program)
640+
assert.Equal(t, swapAction.ProgramName, okx_dex_aggregation_router_v2.ProgramName)
641641
assert.Equal(t, swapAction.InstructionName, "CommissionSplProxySwap")
642642
assert.Equal(t, swapAction.Who, "GKj54MVFppoYsxPU9jMn7CMniVRAuveFadyTtFhn1vXy")
643643
assert.Equal(t, swapAction.FromToken, "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v")
@@ -659,10 +659,10 @@ func TestOKXDEXSwap(t *testing.T) {
659659
results, _ := Parser(byteValue)
660660
action := results[0].Actions[3]
661661

662-
if transferAction, ok := action.(*OKXDEXAggregationRouterV2.SwapAction); ok {
662+
if transferAction, ok := action.(*okx_dex_aggregation_router_v2.SwapAction); ok {
663663
fmt.Println(transferAction.InstructionName)
664-
assert.Equal(t, transferAction.ProgramID, OKXDEXAggregationRouterV2.Program)
665-
assert.Equal(t, transferAction.ProgramName, OKXDEXAggregationRouterV2.ProgramName)
664+
assert.Equal(t, transferAction.ProgramID, okx_dex_aggregation_router_v2.Program)
665+
assert.Equal(t, transferAction.ProgramName, okx_dex_aggregation_router_v2.ProgramName)
666666
assert.Equal(t, transferAction.InstructionName, "Swap")
667667
assert.Equal(t, transferAction.FromToken, "7atgF8KQo4wJrD5ATGX7t1V2zVvykPJbFfNeVf1icFv1")
668668
assert.Equal(t, transferAction.FromTokenAmount, uint64(358800))
@@ -683,10 +683,10 @@ func TestOKXDEXSwap_1(t *testing.T) {
683683
results, _ := Parser(byteValue)
684684
action := results[0].Actions[7]
685685

686-
if transferAction, ok := action.(*OKXDEXAggregationRouterV2.SwapAction); ok {
686+
if transferAction, ok := action.(*okx_dex_aggregation_router_v2.SwapAction); ok {
687687
fmt.Println(transferAction.InstructionName)
688-
assert.Equal(t, transferAction.ProgramID, OKXDEXAggregationRouterV2.Program)
689-
assert.Equal(t, transferAction.ProgramName, OKXDEXAggregationRouterV2.ProgramName)
688+
assert.Equal(t, transferAction.ProgramID, okx_dex_aggregation_router_v2.Program)
689+
assert.Equal(t, transferAction.ProgramName, okx_dex_aggregation_router_v2.ProgramName)
690690
assert.Equal(t, transferAction.InstructionName, "Swap")
691691
assert.Equal(t, transferAction.FromToken, "So11111111111111111111111111111111111111112")
692692
assert.Equal(t, transferAction.FromTokenAmount, uint64(10000000000))
@@ -707,10 +707,10 @@ func TestOKXDEXSwap_2(t *testing.T) {
707707
results, _ := Parser(byteValue)
708708
action := results[0].Actions[4]
709709

710-
if transferAction, ok := action.(*OKXDEXAggregationRouterV2.SwapAction); ok {
710+
if transferAction, ok := action.(*okx_dex_aggregation_router_v2.SwapAction); ok {
711711
fmt.Println(transferAction.InstructionName)
712-
assert.Equal(t, transferAction.ProgramID, OKXDEXAggregationRouterV2.Program)
713-
assert.Equal(t, transferAction.ProgramName, OKXDEXAggregationRouterV2.ProgramName)
712+
assert.Equal(t, transferAction.ProgramID, okx_dex_aggregation_router_v2.Program)
713+
assert.Equal(t, transferAction.ProgramName, okx_dex_aggregation_router_v2.ProgramName)
714714
assert.Equal(t, transferAction.InstructionName, "Swap")
715715
assert.Equal(t, transferAction.FromToken, "HjhCs97TBaJBfaJf3ukzs8CEsGApYjgz88wrhdTPpump")
716716
assert.Equal(t, transferAction.FromTokenAmount, uint64(58882325154))
@@ -731,9 +731,9 @@ func TestOKXDEXCommissionSolSwap(t *testing.T) {
731731
results, _ := Parser(byteValue)
732732
action := results[0].Actions[7]
733733

734-
if swapAction, ok := action.(*OKXDEXAggregationRouterV2.CommissionSolSwap2Action); ok {
735-
assert.Equal(t, swapAction.ProgramID, OKXDEXAggregationRouterV2.Program)
736-
assert.Equal(t, swapAction.ProgramName, OKXDEXAggregationRouterV2.ProgramName)
734+
if swapAction, ok := action.(*okx_dex_aggregation_router_v2.CommissionSolSwap2Action); ok {
735+
assert.Equal(t, swapAction.ProgramID, okx_dex_aggregation_router_v2.Program)
736+
assert.Equal(t, swapAction.ProgramName, okx_dex_aggregation_router_v2.ProgramName)
737737
assert.Equal(t, swapAction.InstructionName, "CommissionSolSwap2")
738738
assert.Equal(t, swapAction.Who, "AG27WXxPym3K73JFKtpRxwbMfnRnuPu5bn6juzcvq5rp")
739739
assert.Equal(t, swapAction.FromToken, "So11111111111111111111111111111111111111112")

‎solana/programs/OKXDEXAggregationRouterV2/meta.go renamed to ‎solana/programs/okx_dex_aggregation_router_v2/meta.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package OKXDEXAggregationRouterV2
1+
package okx_dex_aggregation_router_v2
22

33
const Program = "6m2CDdhRgxpH4WjvdzxAYbGxwdGUz5MziiL5jek2kBma"
44
const ProgramName = "OKX DEX: Aggregation Router V2"

‎solana/programs/OKXDEXAggregationRouterV2/parsers/commission_sol_swap.go renamed to ‎solana/programs/okx_dex_aggregation_router_v2/parsers/commission_sol_swap.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package parsers
22

33
import (
44
"github.com/0xjeffro/tx-parser/solana/globals"
5-
"github.com/0xjeffro/tx-parser/solana/programs/OKXDEXAggregationRouterV2"
5+
"github.com/0xjeffro/tx-parser/solana/programs/okx_dex_aggregation_router_v2"
66
"github.com/0xjeffro/tx-parser/solana/programs/systemProgram"
77
SystemProgramParsers "github.com/0xjeffro/tx-parser/solana/programs/systemProgram/parsers"
88
"github.com/0xjeffro/tx-parser/solana/programs/tokenProgram"
99
TokenProgramParsers "github.com/0xjeffro/tx-parser/solana/programs/tokenProgram/parsers"
1010
"github.com/0xjeffro/tx-parser/solana/types"
1111
)
1212

13-
func CommissionSolSwap2Parser(result *types.ParsedResult, instruction types.Instruction) (*OKXDEXAggregationRouterV2.CommissionSolSwap2Action, error) {
13+
func CommissionSolSwap2Parser(result *types.ParsedResult, instruction types.Instruction) (*okx_dex_aggregation_router_v2.CommissionSolSwap2Action, error) {
1414

1515
var who string
1616
var fromToken, toToken string = globals.WSOL, globals.WSOL
@@ -28,7 +28,7 @@ func CommissionSolSwap2Parser(result *types.ParsedResult, instruction types.Inst
2828
// get index of this instruction
2929
var instructionIndex int
3030
for idx, instr := range result.RawTx.Transaction.Message.Instructions {
31-
if result.AccountList[instr.ProgramIDIndex] == OKXDEXAggregationRouterV2.Program && instr.Data == instruction.Data {
31+
if result.AccountList[instr.ProgramIDIndex] == okx_dex_aggregation_router_v2.Program && instr.Data == instruction.Data {
3232
instructionIndex = idx
3333
break
3434
}
@@ -101,10 +101,10 @@ func CommissionSolSwap2Parser(result *types.ParsedResult, instruction types.Inst
101101
}
102102
}
103103

104-
action := OKXDEXAggregationRouterV2.CommissionSolSwap2Action{
104+
action := okx_dex_aggregation_router_v2.CommissionSolSwap2Action{
105105
BaseAction: types.BaseAction{
106-
ProgramID: OKXDEXAggregationRouterV2.Program,
107-
ProgramName: OKXDEXAggregationRouterV2.ProgramName,
106+
ProgramID: okx_dex_aggregation_router_v2.Program,
107+
ProgramName: okx_dex_aggregation_router_v2.ProgramName,
108108
InstructionName: "CommissionSolSwap2",
109109
},
110110
Who: who,

‎solana/programs/OKXDEXAggregationRouterV2/parsers/commission_spl_proxy_swap.go renamed to ‎solana/programs/okx_dex_aggregation_router_v2/parsers/commission_spl_proxy_swap.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package parsers
22

33
import (
44
"github.com/0xjeffro/tx-parser/solana/globals"
5-
"github.com/0xjeffro/tx-parser/solana/programs/OKXDEXAggregationRouterV2"
5+
"github.com/0xjeffro/tx-parser/solana/programs/okx_dex_aggregation_router_v2"
66
"github.com/0xjeffro/tx-parser/solana/programs/systemProgram"
77
SystemProgramParsers "github.com/0xjeffro/tx-parser/solana/programs/systemProgram/parsers"
88
"github.com/0xjeffro/tx-parser/solana/programs/tokenProgram"
99
TokenProgramParsers "github.com/0xjeffro/tx-parser/solana/programs/tokenProgram/parsers"
1010
"github.com/0xjeffro/tx-parser/solana/types"
1111
)
1212

13-
func CommissionSplProxySwapParser(result *types.ParsedResult, instruction types.Instruction) (*OKXDEXAggregationRouterV2.CommissionSplProxySwapAction, error) {
13+
func CommissionSplProxySwapParser(result *types.ParsedResult, instruction types.Instruction) (*okx_dex_aggregation_router_v2.CommissionSplProxySwapAction, error) {
1414

1515
var who string
1616
var fromToken, toToken string = globals.WSOL, globals.WSOL
@@ -28,7 +28,7 @@ func CommissionSplProxySwapParser(result *types.ParsedResult, instruction types.
2828
// get index of this instruction
2929
var instructionIndex int
3030
for idx, instr := range result.RawTx.Transaction.Message.Instructions {
31-
if result.AccountList[instr.ProgramIDIndex] == OKXDEXAggregationRouterV2.Program && instr.Data == instruction.Data {
31+
if result.AccountList[instr.ProgramIDIndex] == okx_dex_aggregation_router_v2.Program && instr.Data == instruction.Data {
3232
instructionIndex = idx
3333
break
3434
}
@@ -101,10 +101,10 @@ func CommissionSplProxySwapParser(result *types.ParsedResult, instruction types.
101101
}
102102
}
103103

104-
action := OKXDEXAggregationRouterV2.CommissionSplProxySwapAction{
104+
action := okx_dex_aggregation_router_v2.CommissionSplProxySwapAction{
105105
BaseAction: types.BaseAction{
106-
ProgramID: OKXDEXAggregationRouterV2.Program,
107-
ProgramName: OKXDEXAggregationRouterV2.ProgramName,
106+
ProgramID: okx_dex_aggregation_router_v2.Program,
107+
ProgramName: okx_dex_aggregation_router_v2.ProgramName,
108108
InstructionName: "CommissionSplProxySwap",
109109
},
110110
Who: who,

‎solana/programs/OKXDEXAggregationRouterV2/parsers/index.go renamed to ‎solana/programs/okx_dex_aggregation_router_v2/parsers/index.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package parsers
22

33
import (
4-
"github.com/0xjeffro/tx-parser/solana/programs/OKXDEXAggregationRouterV2"
4+
"github.com/0xjeffro/tx-parser/solana/programs/okx_dex_aggregation_router_v2"
55
"github.com/0xjeffro/tx-parser/solana/types"
66
"github.com/mr-tron/base58"
77
)
@@ -15,18 +15,18 @@ func InstructionRouter(result *types.ParsedResult, instruction types.Instruction
1515
discriminator := *(*[8]byte)(decode[:8])
1616

1717
switch discriminator {
18-
case OKXDEXAggregationRouterV2.CommissionSplProxySwapDiscriminator:
18+
case okx_dex_aggregation_router_v2.CommissionSplProxySwapDiscriminator:
1919
return CommissionSplProxySwapParser(result, instruction)
20-
case OKXDEXAggregationRouterV2.SwapDiscriminator:
20+
case okx_dex_aggregation_router_v2.SwapDiscriminator:
2121
return SwapParser(result, instruction, decode)
22-
case OKXDEXAggregationRouterV2.CommissionSolSwap2Discriminator:
22+
case okx_dex_aggregation_router_v2.CommissionSolSwap2Discriminator:
2323
return CommissionSolSwap2Parser(result, instruction)
2424

2525
default:
2626
return types.UnknownAction{
2727
BaseAction: types.BaseAction{
2828
ProgramID: result.AccountList[instruction.ProgramIDIndex],
29-
ProgramName: OKXDEXAggregationRouterV2.ProgramName,
29+
ProgramName: okx_dex_aggregation_router_v2.ProgramName,
3030
InstructionName: "Unknown",
3131
},
3232
}, nil

‎solana/programs/OKXDEXAggregationRouterV2/parsers/swap.go renamed to ‎solana/programs/okx_dex_aggregation_router_v2/parsers/swap.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package parsers
22

33
import (
44
"encoding/binary"
5-
"github.com/0xjeffro/tx-parser/solana/programs/OKXDEXAggregationRouterV2"
5+
"github.com/0xjeffro/tx-parser/solana/programs/okx_dex_aggregation_router_v2"
66
"github.com/0xjeffro/tx-parser/solana/programs/systemProgram"
77
SystemProgramParsers "github.com/0xjeffro/tx-parser/solana/programs/systemProgram/parsers"
88
"github.com/0xjeffro/tx-parser/solana/programs/tokenProgram"
99
TokenProgramParsers "github.com/0xjeffro/tx-parser/solana/programs/tokenProgram/parsers"
1010
"github.com/0xjeffro/tx-parser/solana/types"
1111
)
1212

13-
func SwapParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*OKXDEXAggregationRouterV2.SwapAction, error) {
13+
func SwapParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*okx_dex_aggregation_router_v2.SwapAction, error) {
1414
who := result.AccountList[instruction.Accounts[0]]
1515
fromToken := result.AccountList[instruction.Accounts[3]]
1616
toToken := result.AccountList[instruction.Accounts[4]]
@@ -22,7 +22,7 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, decod
2222
// get index of this instruction
2323
var instructionIndex int
2424
for idx, instr := range result.RawTx.Transaction.Message.Instructions {
25-
if result.AccountList[instr.ProgramIDIndex] == OKXDEXAggregationRouterV2.Program && instr.Data == instruction.Data {
25+
if result.AccountList[instr.ProgramIDIndex] == okx_dex_aggregation_router_v2.Program && instr.Data == instruction.Data {
2626
instructionIndex = idx
2727
break
2828
}
@@ -92,10 +92,10 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, decod
9292
}
9393
}
9494

95-
action := OKXDEXAggregationRouterV2.SwapAction{
95+
action := okx_dex_aggregation_router_v2.SwapAction{
9696
BaseAction: types.BaseAction{
97-
ProgramID: OKXDEXAggregationRouterV2.Program,
98-
ProgramName: OKXDEXAggregationRouterV2.ProgramName,
97+
ProgramID: okx_dex_aggregation_router_v2.Program,
98+
ProgramName: okx_dex_aggregation_router_v2.ProgramName,
9999
InstructionName: "Swap",
100100
},
101101
Who: who,

‎solana/programs/OKXDEXAggregationRouterV2/types.go renamed to ‎solana/programs/okx_dex_aggregation_router_v2/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package OKXDEXAggregationRouterV2
1+
package okx_dex_aggregation_router_v2
22

33
import "github.com/0xjeffro/tx-parser/solana/types"
44

‎solana/router.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package solana
22

33
import (
4-
"github.com/0xjeffro/tx-parser/solana/programs/OKXDEXAggregationRouterV2"
5-
OKXDEXAggregationRouterV2Parsers "github.com/0xjeffro/tx-parser/solana/programs/OKXDEXAggregationRouterV2/parsers"
64
"github.com/0xjeffro/tx-parser/solana/programs/compute_budget"
75
ComputeBudgetParsers "github.com/0xjeffro/tx-parser/solana/programs/compute_budget/parsers"
86
"github.com/0xjeffro/tx-parser/solana/programs/jupiter_aggregator_v6"
97
JupiterAggregatorV6 "github.com/0xjeffro/tx-parser/solana/programs/jupiter_aggregator_v6/parsers"
108
"github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca"
119
JupiterDCA "github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca/parsers"
10+
"github.com/0xjeffro/tx-parser/solana/programs/okx_dex_aggregation_router_v2"
11+
OKXDEXAggregationRouterV2Parsers "github.com/0xjeffro/tx-parser/solana/programs/okx_dex_aggregation_router_v2/parsers"
1212
"github.com/0xjeffro/tx-parser/solana/programs/pumpfun"
1313
PumpfunParsers "github.com/0xjeffro/tx-parser/solana/programs/pumpfun/parsers"
1414
"github.com/0xjeffro/tx-parser/solana/programs/raydiumLiquidityPoolV4"
@@ -44,7 +44,7 @@ func router(result *types.ParsedResult, instructionIdx int) (action types.Action
4444
return RaydiumLiquidityPoolV4.InstructionRouter(result, instruction, instructionIdx)
4545
case jupiter_aggregator_v6.Program:
4646
return JupiterAggregatorV6.InstructionRouter(result, instruction)
47-
case OKXDEXAggregationRouterV2.Program:
47+
case okx_dex_aggregation_router_v2.Program:
4848
return OKXDEXAggregationRouterV2Parsers.InstructionRouter(result, instruction)
4949

5050
default:

0 commit comments

Comments
 (0)