channel fund reverted

Author: florent-uzio

xrpl/transaction/payment_channel_fund.go

@@ -1,7 +1,6 @@
 package transaction
 
 import (
-	"encoding/json"
 	"time"
 
 	rippletime "github.com/Peersyst/xrpl-go/xrpl/time"
@@ -28,7 +27,7 @@ type PaymentChannelFund struct {
 	// The unique ID of the channel to fund, as a 64-character hexadecimal string.
 	Channel types.Hash256
 	// Amount of XRP, in drops to add to the channel. Must be a positive amount of XRP.
-	Amount types.CurrencyAmount
+	Amount types.XRPCurrencyAmount
 	// (Optional) New Expiration time to set for the channel, in seconds since the Ripple Epoch.
 	// This must be later than either the current time plus the SettleDelay of the channel, or the existing Expiration of the channel.
 	// After the Expiration time, any transaction that would access the channel closes the channel without taking its normal action.
@@ -46,7 +45,7 @@ func (p *PaymentChannelFund) Flatten() FlatTransaction {
 	flattened := p.BaseTx.Flatten()
 
 	flattened["Channel"] = p.Channel.String()
-	flattened["Amount"] = p.Amount.Flatten()
+	flattened["Amount"] = p.Amount.String()
 
 	if p.Expiration != 0 {
 		flattened["Expiration"] = p.Expiration
@@ -70,26 +69,3 @@ func (p *PaymentChannelFund) Validate() (bool, error) {
 
 	return true, nil
 }
-
-// UnmarshalJSON unmarshals the PaymentChannelFund transaction from JSON.
-func (p *PaymentChannelFund) UnmarshalJSON(data []byte) error {
-	type paymentChannelFundHelper struct {
-		BaseTx
-		Amount     json.RawMessage
-		Expiration uint32 `json:",omitempty"`
-	}
-	var h paymentChannelFundHelper
-	if err := json.Unmarshal(data, &h); err != nil {
-		return err
-	}
-	*p = PaymentChannelFund{
-		BaseTx:     h.BaseTx,
-		Expiration: h.Expiration,
-	}
-	amount, err := types.UnmarshalCurrencyAmount(h.Amount)
-	if err != nil {
-		return err
-	}
-	p.Amount = amount
-	return nil
-}

xrpl/transaction/payment_channel_fund_test.go

@@ -1,7 +1,6 @@
 package transaction
 
 import (
-	"encoding/json"
 	"testing"
 	"time"
 
@@ -58,58 +57,6 @@ func TestPaymentChannelFund_Flatten(t *testing.T) {
 				"Expiration": 543171558
 			}`,
 		},
-		{
-			name: "pass - with Expiration and Amount as MPTCurrencyAmount",
-			tx: &PaymentChannelFund{
-				BaseTx: BaseTx{
-					Account:         "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
-					TransactionType: PaymentChannelFundTx,
-				},
-				Channel: "DEF456",
-				Amount: types.MPTCurrencyAmount{
-					MPTIssuanceID: "1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF",
-					Value:         "300000",
-				},
-				Expiration: 543171558,
-			},
-			expected: `{
-				"Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
-				"TransactionType": "PaymentChannelFund",
-				"Channel": "DEF456",
-				"Amount": {
-					"mpt_issuance_id": "1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF",
-					"value": "300000"
-				},
-				"Expiration": 543171558
-			}`,
-		},
-		{
-			name: "pass - with Expiration and Amount as IssuedCurrencyAmount",
-			tx: &PaymentChannelFund{
-				BaseTx: BaseTx{
-					Account:         "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
-					TransactionType: PaymentChannelFundTx,
-				},
-				Channel: "DEF456",
-				Amount: types.IssuedCurrencyAmount{
-					Issuer:   "rEXAMPLE123456789ABCDEFGHJKLMNPQRSTUVWXYZ",
-					Currency: "USD",
-					Value:    "300000",
-				},
-				Expiration: 543171558,
-			},
-			expected: `{
-				"Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
-				"TransactionType": "PaymentChannelFund",
-				"Channel": "DEF456",
-				"Amount": {
-					"issuer": "rEXAMPLE123456789ABCDEFGHJKLMNPQRSTUVWXYZ",
-					"currency": "USD",
-					"value": "300000"
-				},
-				"Expiration": 543171558
-			}`,
-		},
 	}
 
 	for _, tt := range tests {
@@ -197,57 +144,3 @@ func TestPaymentChannelFund_Validate(t *testing.T) {
 		})
 	}
 }
-
-func TestPaymentChannelFund_Unmarshal(t *testing.T) {
-	tests := []struct {
-		name                 string
-		jsonData             string
-		expectUnmarshalError bool
-	}{
-		{
-			name: "pass - full PaymentChannelFund with MPTCurrencyAmount",
-			jsonData: `{
-				"TransactionType": "PaymentChannelFund",
-				"Account": "rEXAMPLE123456789ABCDEFGHJKLMNPQRSTUVWXYZ",
-				"Channel": "DEF456",
-				"Amount": {
-					"mpt_issuance_id": "1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF",
-					"value": "300000"
-				},
-				"Expiration": 543171558
-			}`,
-		},
-		{
-			name: "pass - full PaymentChannelFund with IssuedCurrencyAmount",
-			jsonData: `{
-				"TransactionType": "PaymentChannelFund",
-				"Account": "rEXAMPLE123456789ABCDEFGHJKLMNPQRSTUVWXYZ",
-				"Channel": "DEF456",
-				"Amount": {
-					"issuer": "rEXAMPLE123456789ABCDEFGHJKLMNPQRSTUVWXYZ",
-					"currency": "USD",
-					"value": "300000"
-				},
-				"Expiration": 543171558
-			}`,
-		},
-		{
-			name: "pass - full PaymentChannelFund with XRPCurrencyAmount",
-			jsonData: `{
-				"TransactionType": "PaymentChannelFund",
-				"Account": "rEXAMPLE123456789ABCDEFGHJKLMNPQRSTUVWXYZ",
-				"Channel": "DEF456",
-				"Amount": "300000",
-				"Expiration": 543171558
-			}`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var paymentChannelFund PaymentChannelFund
-			err := json.Unmarshal([]byte(tt.jsonData), &paymentChannelFund)
-			assert.Equal(t, tt.expectUnmarshalError, err != nil)
-		})
-	}
-}