Skip to content
This repository has been archived by the owner on Nov 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #23 from CudoVentures/rename-aruapool-to-cudosmark…
Browse files Browse the repository at this point in the history 
…ets-in-addressbook

rename aruapool to cudosmarkets in addressbook
  • Loading branch information
@kstoykov
kstoykov authored May 30, 2023
2 parents b8855a5 + fc6d142 commit 30bb6e0
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 88 deletions.
2 changes: 1 addition & 1 deletion internal/app/tokenised-infrastructure-rewarder/requesters/chain_requester.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (r *Requester) GetPayoutAddressFromNode(ctx context.Context, cudosAddress,
Timeout: 60 * time.Second,
}

requestString := fmt.Sprintf("/CudoVentures/cudos-node/addressbook/address/%s/aurapool/aurapool", cudosAddress)
requestString := fmt.Sprintf("/CudoVentures/cudos-node/addressbook/address/%s/cudosmarkets/cudosmarkets", cudosAddress)

req, err := http.NewRequestWithContext(ctx, "GET", r.config.NodeRestUrl+requestString, nil)
if err != nil {
Expand Down
183 changes: 96 additions & 87 deletions internal/app/tokenised-infrastructure-rewarder/services/pay_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ func TestMain(m *testing.M) {

func TestProcessPayment(t *testing.T) {
config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
}

btcNetworkParams := &types.BtcNetworkParams{
Expand All @@ -50,11 +51,12 @@ func TestProcessPayment(t *testing.T) {

func TestProcessFarm(t *testing.T) {
config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
}

btcNetworkParams := &types.BtcNetworkParams{
Expand All @@ -74,17 +76,18 @@ func TestPayService_ProcessPayment_Threshold(t *testing.T) {
skipDBTests(t)

config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 2,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
DbDriverName: "postgres",
DbUser: "postgresUser",
DbPassword: "mysecretpassword",
DbHost: "127.0.0.1",
DbPort: "5432",
DbName: "aura-pay-test-db",
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 2,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
DbDriverName: "postgres",
DbUser: "postgresUser",
DbPassword: "mysecretpassword",
DbHost: "127.0.0.1",
DbPort: "5432",
DbName: "aura-pay-test-db",
}

btcNetworkParams := &types.BtcNetworkParams{
Expand Down Expand Up @@ -122,7 +125,7 @@ func TestPayService_ProcessPayment_Threshold(t *testing.T) {

amountAccumulatedBTC, _ := dbStorage.GetCurrentAcummulatedAmountForAddress(context.Background(), "maintenance_fee_payout_address_1", 1)
require.Equal(t, float64(5928), amountAccumulatedBTC)
amountAccumulatedBTC, _ = dbStorage.GetCurrentAcummulatedAmountForAddress(context.Background(), "cudo_maintenance_fee_payout_address_1", 1)
amountAccumulatedBTC, _ = dbStorage.GetCurrentAcummulatedAmountForAddress(context.Background(), "cudo_fee_payout_address_1", 1)
require.Equal(t, float64(10210010), amountAccumulatedBTC)
amountAccumulatedBTC, _ = dbStorage.GetCurrentAcummulatedAmountForAddress(context.Background(), "nft_minter_payout_addr", 1)
require.Equal(t, float64(0), amountAccumulatedBTC)
Expand All @@ -134,11 +137,12 @@ func TestPayService_ProcessPayment_Threshold(t *testing.T) {

func TestPayService_ProcessPayment_Mint_Between_Payments(t *testing.T) {
config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
}

btcNetworkParams := &types.BtcNetworkParams{
Expand Down Expand Up @@ -171,17 +175,18 @@ func TestPayService_ProcessPayment_Mint_Between_Payments(t *testing.T) {

collectionAllocationAmount := decimal.NewFromFloat(4)
leftoverAmount := decimal.NewFromFloat(3)
cudoMaintenanceFee := decimal.NewFromFloat(1.25012768)
cudoFee := decimal.NewFromFloat(1.25)
nftMinterAmount, _ := decimal.NewFromString("1.9997446236559112")
cudoPartOfReward := decimal.NewFromFloat(1.25)
cudoPartOfMaintenanceFee, _ := decimal.NewFromString("0.0001276881720444")
maintenanceFeeAddress1Amount, _ := decimal.NewFromString("0.0001276881720444")

// maintenance_fee_payout_address_1 is below threshold of 0.01 with values 5.928e-05
// call it once to clear mock
mockAPIRequester.On("SendMany", mock.Anything, map[string]float64{
"leftover_reward_payout_address_1": leftoverAmount.InexactFloat64(),
"cudo_maintenance_fee_payout_address_1": cudoMaintenanceFee.InexactFloat64(),
"nft_minter_payout_addr": nftMinterAmount.RoundFloor(8).InexactFloat64(),
"leftover_reward_payout_address_1": leftoverAmount.InexactFloat64(),
"cudo_fee_payout_address_1": cudoFee.InexactFloat64(),
"nft_minter_payout_addr": nftMinterAmount.RoundFloor(8).InexactFloat64(),
}).Return("farm_1_denom_1_nft_owner_2_tx_hash", nil).Once()

storage := setupMockStorage()
Expand All @@ -204,12 +209,12 @@ func TestPayService_ProcessPayment_Mint_Between_Payments(t *testing.T) {
mock.MatchedBy(func(amountInfoMap map[string]types.AmountInfo) bool {
return amountInfoMap["leftover_reward_payout_address_1"].ThresholdReached == true &&
amountInfoMap["nft_minter_payout_addr"].ThresholdReached == true &&
amountInfoMap["cudo_maintenance_fee_payout_address_1"].ThresholdReached == true &&
amountInfoMap["cudo_fee_payout_address_1"].ThresholdReached == true &&
amountInfoMap["maintenance_fee_payout_address_1"].ThresholdReached == false &&

amountInfoMap["leftover_reward_payout_address_1"].Amount.Equals(leftoverAmount.RoundFloor(8)) &&
amountInfoMap["nft_minter_payout_addr"].Amount.Equals(nftMinterAmount.RoundFloor(8)) &&
amountInfoMap["cudo_maintenance_fee_payout_address_1"].Amount.Equals(cudoMaintenanceFee.RoundFloor(8)) &&
amountInfoMap["cudo_fee_payout_address_1"].Amount.Equals(cudoFee.RoundFloor(8)) &&
amountInfoMap["maintenance_fee_payout_address_1"].Amount.Equals(maintenanceFeeAddress1Amount.RoundFloor(8))
}),

Expand Down Expand Up @@ -246,11 +251,12 @@ func TestPayService_ProcessPayment_Mint_Between_Payments(t *testing.T) {

func TestPayService_ProcessPayment_Expiration_Between_Payments(t *testing.T) {
config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
}

btcNetworkParams := &types.BtcNetworkParams{
Expand Down Expand Up @@ -320,9 +326,9 @@ func TestPayService_ProcessPayment_Expiration_Between_Payments(t *testing.T) {

// maintenance_fee_payout_address_1 is below threshold of 0.01 with values 5.928e-05
mockAPIRequester.On("SendMany", mock.Anything, map[string]float64{
"leftover_reward_payout_address_1": leftoverAmount.InexactFloat64(),
"cudo_maintenance_fee_payout_address_1": cudoMaintenanceFee.InexactFloat64(),
"nft_minter_payout_addr": nftMinterAmount.RoundFloor(8).InexactFloat64(),
"leftover_reward_payout_address_1": leftoverAmount.InexactFloat64(),
"cudo_fee_payout_address_1": cudoMaintenanceFee.InexactFloat64(),
"nft_minter_payout_addr": nftMinterAmount.RoundFloor(8).InexactFloat64(),
}).Return("farm_1_denom_1_nft_owner_2_tx_hash", nil).Once()

storage := setupMockStorage()
Expand All @@ -334,12 +340,12 @@ func TestPayService_ProcessPayment_Expiration_Between_Payments(t *testing.T) {
mock.MatchedBy(func(amountInfoMap map[string]types.AmountInfo) bool {
return amountInfoMap["leftover_reward_payout_address_1"].ThresholdReached == true &&
amountInfoMap["nft_minter_payout_addr"].ThresholdReached == true &&
amountInfoMap["cudo_maintenance_fee_payout_address_1"].ThresholdReached == true &&
amountInfoMap["cudo_fee_payout_address_1"].ThresholdReached == true &&
amountInfoMap["maintenance_fee_payout_address_1"].ThresholdReached == false &&

amountInfoMap["leftover_reward_payout_address_1"].Amount.Equals(leftoverAmount.RoundFloor(8)) &&
amountInfoMap["nft_minter_payout_addr"].Amount.Equals(nftMinterAmount.RoundFloor(8)) &&
amountInfoMap["cudo_maintenance_fee_payout_address_1"].Amount.Equals(cudoMaintenanceFee.RoundFloor(8)) &&
amountInfoMap["cudo_fee_payout_address_1"].Amount.Equals(cudoMaintenanceFee.RoundFloor(8)) &&
amountInfoMap["maintenance_fee_payout_address_1"].Amount.Equals(maintenanceFeeAddress1Amount.RoundFloor(8))
}),
mock.MatchedBy(func(collectionAllocations []types.CollectionPaymentAllocation) bool {
Expand Down Expand Up @@ -386,11 +392,12 @@ func TestPayService_ProcessPayment_Expiration_Between_Payments(t *testing.T) {

func TestPayService_ProcessPayment_NFT_Minted_After_Payment_Period(t *testing.T) {
config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
}

btcNetworkParams := &types.BtcNetworkParams{
Expand Down Expand Up @@ -459,8 +466,8 @@ func TestPayService_ProcessPayment_NFT_Minted_After_Payment_Period(t *testing.T)

// maintenance_fee_payout_address_1 is below threshold of 0.01 with values 5.928e-05
mockAPIRequester.On("SendMany", mock.Anything, map[string]float64{
"leftover_reward_payout_address_1": 5,
"cudo_maintenance_fee_payout_address_1": 1.25,
"leftover_reward_payout_address_1": 5,
"cudo_fee_payout_address_1": 1.25,
}).Return("farm_1_denom_1_nft_owner_2_tx_hash", nil).Once()

storage := setupMockStorage()
Expand All @@ -482,9 +489,9 @@ func TestPayService_ProcessPayment_NFT_Minted_After_Payment_Period(t *testing.T)
}),
mock.MatchedBy(func(amountInfoMap map[string]types.AmountInfo) bool {
return amountInfoMap["leftover_reward_payout_address_1"].ThresholdReached == true &&
amountInfoMap["cudo_maintenance_fee_payout_address_1"].ThresholdReached == true &&
amountInfoMap["cudo_fee_payout_address_1"].ThresholdReached == true &&
amountInfoMap["leftover_reward_payout_address_1"].Amount.Equals(leftoverAmount) &&
amountInfoMap["cudo_maintenance_fee_payout_address_1"].Amount.Equals(cudoMaintenanceFee)
amountInfoMap["cudo_fee_payout_address_1"].Amount.Equals(cudoMaintenanceFee)
}),

mock.MatchedBy(func(nftStatistics []types.NFTStatistics) bool {
Expand All @@ -508,11 +515,12 @@ func TestProcessFarmUnspentTx_HappyPath(t *testing.T) {
mockApiRequester := setupMockApiRequester(t)

config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 20,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
}

btcNetworkParams := &types.BtcNetworkParams{
Expand Down Expand Up @@ -562,17 +570,18 @@ func TestProcessFarmUnspentTx_FailedToGetTxDetails(t *testing.T) {
testCtx := context.Background()

config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 2,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
DbDriverName: "postgres",
DbUser: "postgresUser",
DbPassword: "mysecretpassword",
DbHost: "127.0.0.1",
DbPort: "5432",
DbName: "aura-pay-test-db",
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 2,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
DbDriverName: "postgres",
DbUser: "postgresUser",
DbPassword: "mysecretpassword",
DbHost: "127.0.0.1",
DbPort: "5432",
DbName: "aura-pay-test-db",
}

btcNetworkParams := &types.BtcNetworkParams{
Expand Down Expand Up @@ -617,17 +626,18 @@ func TestProcessFarmUnspentTx_EmptyCollectionList(t *testing.T) {
testCtx := context.Background()

config := &infrastructure.Config{
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 2,
CUDOFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
DbDriverName: "postgres",
DbUser: "postgresUser",
DbPassword: "mysecretpassword",
DbHost: "127.0.0.1",
DbPort: "5432",
DbName: "aura-pay-test-db",
Network: "BTC",
CUDOMaintenanceFeePercent: 50,
CUDOFeeOnAllBTC: 2,
CUDOFeePayoutAddress: "cudo_fee_payout_address_1",
CUDOMaintenanceFeePayoutAddress: "cudo_maintenance_fee_payout_address_1",
GlobalPayoutThresholdInBTC: 0.01,
DbDriverName: "postgres",
DbUser: "postgresUser",
DbPassword: "mysecretpassword",
DbHost: "127.0.0.1",
DbPort: "5432",
DbName: "aura-pay-test-db",
}

btcNetworkParams := &types.BtcNetworkParams{
Expand Down Expand Up @@ -735,7 +745,7 @@ func TestSendRewards(t *testing.T) {
expectError: nil,
},
{
name: "happy path",
name: "send_many_error",
unspentTxForFarm: btcjson.ListUnspentResult{
TxID: "1",
Amount: 6.25,
Expand Down Expand Up @@ -1014,10 +1024,10 @@ func setupMockApiRequester(t *testing.T) *mockAPIRequester {

// maintenance_fee_payout_address_1 is below threshold of 0.01 with values 5.928e-05
apiRequester.On("SendMany", mock.Anything, map[string]float64{
"leftover_reward_payout_address_1": 1,
"cudo_maintenance_fee_payout_address_1": 1.25025537,
"nft_minter_payout_addr": 1.05249717,
"nft_owner_2_payout_addr": 2.94699207,
"leftover_reward_payout_address_1": 1,
"cudo_fee_payout_address_1": 1.25,
"nft_minter_payout_addr": 1.05249717,
"nft_owner_2_payout_addr": 2.94699207,
}).Return("farm_1_denom_1_nft_owner_2_tx_hash", nil).Once()

return apiRequester
Expand Down Expand Up @@ -1108,17 +1118,16 @@ func setupMockStorage() *mockStorage {
collectionAllocations[0].FarmMaintenanceFee.Equals(maintenanceFeeAddress1Amount)
}),
mock.MatchedBy(func(amountInfoMap map[string]types.AmountInfo) bool {

return amountInfoMap["leftover_reward_payout_address_1"].ThresholdReached == true &&
amountInfoMap["nft_minter_payout_addr"].ThresholdReached == true &&
amountInfoMap["nft_owner_2_payout_addr"].ThresholdReached == true &&
amountInfoMap["cudo_maintenance_fee_payout_address_1"].ThresholdReached == true &&
amountInfoMap["cudo_fee_payout_address_1"].ThresholdReached == true &&
amountInfoMap["maintenance_fee_payout_address_1"].ThresholdReached == false &&

amountInfoMap["leftover_reward_payout_address_1"].Amount.Equals(leftoverAmount.RoundFloor(8)) &&
amountInfoMap["nft_minter_payout_addr"].Amount.Equals(nftMinterAmount.RoundFloor(8)) &&
amountInfoMap["nft_owner_2_payout_addr"].Amount.Equals(nftOwner2Amount.RoundFloor(8)) &&
amountInfoMap["cudo_maintenance_fee_payout_address_1"].Amount.Equals(cudoPartOfMaintenanceFee.Add(cudoPartOfReward).RoundFloor(8)) &&
amountInfoMap["cudo_fee_payout_address_1"].Amount.Equals(cudoPartOfReward.RoundFloor(8)) &&
amountInfoMap["maintenance_fee_payout_address_1"].Amount.Equals(maintenanceFeeAddress1Amount.RoundFloor(8))
}),

Expand Down

0 comments on commit 30bb6e0

Please sign in to comment.