Model validation

model/client/account/account_channels_request.go

@@ -2,7 +2,7 @@ package account
 
 import (
 	"encoding/json"
-	"errors"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -21,10 +21,14 @@ func (*AccountChannelsRequest) Method() string {
 	return "account_channels"
 }
 
-// Validate method to be added to each request struct
-func (a *AccountChannelsRequest) Validate() error {
-	if a.Account == "" {
-		return errors.New("no account ID specified")
+func (r *AccountChannelsRequest) Validate() error {
+	if err := r.Account.Validate(); err != nil {
+		return fmt.Errorf("account channels request: %w", err)
+	}
+	if len(r.DestinationAccount) > 0 {
+		if err := r.DestinationAccount.Validate(); err != nil {
+			return fmt.Errorf("account channels request: %w", err)
+		}
 	}
 
 	return nil

model/client/account/account_channels_test.go

@@ -72,5 +72,5 @@ func TestValidate(t *testing.T) {
 
 	err := s.Validate()
 
-	assert.EqualError(t, err, "no account ID specified")
+	assert.ErrorContains(t, err, "missing xrpl address")
 }

model/client/account/account_currencies_request.go

@@ -2,6 +2,7 @@ package account
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -18,6 +19,14 @@ func (*AccountCurrenciesRequest) Method() string {
 	return "account_currencies"
 }
 
+func (r *AccountCurrenciesRequest) Validate() error {
+	if err := r.Account.Validate(); err != nil {
+		return fmt.Errorf("account currencies request: %w", err)
+	}
+
+	return nil
+}
+
 func (r *AccountCurrenciesRequest) UnmarshalJSON(data []byte) error {
 	type acrHelper struct {
 		Account     types.Address     `json:"account"`

model/client/account/account_currencies_test.go

@@ -3,6 +3,7 @@ package account
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/test"
 )
@@ -55,3 +56,13 @@ func TestAccountCurrenciesResponse(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestAccountCurrenciesValidation(t *testing.T) {
+	s := AccountCurrenciesRequest{
+		Account: "",
+	}
+	err := s.Validate()
+
+	assert.ErrorContains(t, err, "missing xrpl address")
+
+}

model/client/account/account_info_request.go

@@ -2,6 +2,7 @@ package account
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -20,7 +21,11 @@ func (*AccountInfoRequest) Method() string {
 	return "account_info"
 }
 
-func (*AccountInfoRequest) Validate() error {
+func (r *AccountInfoRequest) Validate() error {
+	if err := r.Account.Validate(); err != nil {
+		return fmt.Errorf("account info request: %w", err)
+	}
+
 	return nil
 }
 

model/client/account/account_info_test.go

@@ -3,6 +3,7 @@ package account
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/ledger"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -110,3 +111,13 @@ func TestAccountInfoResponse(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestAccountInfoValidate(t *testing.T) {
+	s := AccountInfoRequest{
+		Account: "",
+	}
+
+	err := s.Validate()
+
+	assert.ErrorContains(t, err, "missing xrpl address")
+}

model/client/account/account_lines_request.go

@@ -2,6 +2,7 @@ package account
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -20,6 +21,23 @@ func (*AccountLinesRequest) Method() string {
 	return "account_lines"
 }
 
+func (r *AccountLinesRequest) Validate() error {
+	if err := r.Account.Validate(); err != nil {
+		return fmt.Errorf("account lines request account: %w", err)
+	}
+
+	if r.Limit != 0 && (r.Limit < 10 || r.Limit > 400) {
+		return fmt.Errorf("account lines request: invalid limit, must be 10 <= limit <= 400")
+	}
+
+	if r.Peer != "" {
+		if err := r.Peer.Validate(); err != nil {
+			return fmt.Errorf("account lines request peer: %w", err)
+		}
+	}
+
+	return nil
+}
 func (r *AccountLinesRequest) UnmarshalJSON(data []byte) error {
 	type alrHelper struct {
 		Account     types.Address     `json:"account"`

model/client/account/account_lines_test.go

@@ -3,6 +3,7 @@ package account
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/test"
 )
@@ -74,3 +75,19 @@ func TestAccountLinesResponse(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestAccountLinesValidate(t *testing.T) {
+	s := AccountLinesRequest{
+		Account: "",
+	}
+
+	err := s.Validate()
+
+	assert.ErrorContains(t, err, "missing xrpl address")
+
+	s.Account = "r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59"
+	s.Limit = 2
+	err = s.Validate()
+
+	assert.ErrorContains(t, err, "invalid limit")
+}

model/client/account/account_nfts_request.go

@@ -2,6 +2,7 @@ package account
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -19,6 +20,18 @@ func (*AccountNFTsRequest) Method() string {
 	return "account_nfts"
 }
 
+func (r *AccountNFTsRequest) Validate() error {
+	if err := r.Account.Validate(); err != nil {
+		return fmt.Errorf("account nfts request: %w", err)
+	}
+
+	if r.Limit != 0 && (r.Limit < 20 || r.Limit > 400) {
+		return fmt.Errorf("account nfts request: invalid limit, must be 20 <= limit <= 400")
+	}
+
+	return nil
+}
+
 func (r *AccountNFTsRequest) UnmarshalJSON(data []byte) error {
 	type anrHelper struct {
 		Account     types.Address     `json:"account"`

model/client/account/account_objects_request.go

@@ -2,6 +2,7 @@ package account
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -35,6 +36,18 @@ func (*AccountObjectsRequest) Method() string {
 	return "account_objects"
 }
 
+func (r *AccountObjectsRequest) Validate() error {
+	if err := r.Account.Validate(); err != nil {
+		return fmt.Errorf("account objects request: %w", err)
+	}
+
+	if r.Limit != 0 && (r.Limit < 10 || r.Limit > 400) {
+		return fmt.Errorf("account objects request: invalid limit, must be 10 <= limit <= 400")
+	}
+
+	return nil
+}
+
 func (r *AccountObjectsRequest) UnmarshalJSON(data []byte) error {
 	type aorHelper struct {
 		Account              types.Address     `json:"account"`

model/client/account/account_offers_request.go

@@ -2,6 +2,7 @@ package account
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -20,6 +21,18 @@ func (*AccountOffersRequest) Method() string {
 	return "account_offers"
 }
 
+func (r *AccountOffersRequest) Validate() error {
+	if err := r.Account.Validate(); err != nil {
+		return fmt.Errorf("account offers request: %w", err)
+	}
+
+	if r.Limit != 0 && (r.Limit < 10 || r.Limit > 400) {
+		return fmt.Errorf("account offers request: invalid limit, must be 10 <= limit <= 400")
+	}
+
+	return nil
+}
+
 func (r *AccountOffersRequest) UnmarshalJSON(data []byte) error {
 	type aorHelper struct {
 		Account     types.Address     `json:"account"`

model/client/account/account_transactions_request.go

@@ -2,6 +2,7 @@ package account
 
 import (
 	"encoding/json"
+	"fmt"
 
 	"github.com/xyield/xrpl-go/model/client/common"
 	"github.com/xyield/xrpl-go/model/transactions/types"
@@ -23,6 +24,18 @@ func (*AccountTransactionsRequest) Method() string {
 	return "account_tx"
 }
 
+func (r *AccountTransactionsRequest) Validate() error {
+	if err := r.Account.Validate(); err != nil {
+		return fmt.Errorf("account transactions request: %w", err)
+	}
+
+	if r.Limit != 0 && (r.Limit < 10 || r.Limit > 400) {
+		return fmt.Errorf("account transactions request: invalid limit, must be 10 <= limit <= 400")
+	}
+
+	return nil
+}
+
 func (r *AccountTransactionsRequest) UnmarshalJSON(data []byte) error {
 	type atrHelper struct {
 		Account        types.Address     `json:"account"`

model/client/admin/data/can_delete_request.go

@@ -14,6 +14,10 @@ func (*CanDeleteRequest) Method() string {
 	return "can_delete"
 }
 
+func (*CanDeleteRequest) Validate() error {
+	return nil
+}
+
 func (r *CanDeleteRequest) UnmarshalJSON(data []byte) error {
 	type cdHelper struct {
 		CanDelete json.RawMessage `json:"can_delete"`

model/client/admin/data/crawl_shards_request.go

@@ -1,5 +1,7 @@
 package data
 
+import "fmt"
+
 type CrawlShardsRequest struct {
 	PublicKey bool `json:"public_key,omitempty"`
 	Limit     int  `json:"limit,omitempty"`
@@ -8,3 +10,11 @@ type CrawlShardsRequest struct {
 func (*CrawlShardsRequest) Method() string {
 	return "crawl_shards"
 }
+
+func (r *CrawlShardsRequest) Validate() error {
+	if r.Limit < 0 || r.Limit > 3 {
+		return fmt.Errorf("crawl shards request: invalid limit, must be 0 <= limit <= 3")
+	}
+
+	return nil
+}

model/client/admin/data/download_shard_request.go

@@ -1,6 +1,10 @@
 package data
 
-import "github.com/xyield/xrpl-go/model/client/common"
+import (
+	"fmt"
+
+	"github.com/xyield/xrpl-go/model/client/common"
+)
 
 type DownloadShardRequest struct {
 	Shards []ShardDescriptor `json:"shards"`
@@ -14,3 +18,10 @@ type ShardDescriptor struct {
 func (*DownloadShardRequest) Method() string {
 	return "download_shard"
 }
+
+func (d *DownloadShardRequest) Validate() error {
+	if len(d.Shards) == 0 {
+		return fmt.Errorf("download shard request: no shard descriptors provided")
+	}
+	return nil
+}

model/client/admin/data/ledger_cleaner_request.go

@@ -15,3 +15,7 @@ type LedgerCleanerRequest struct {
 func (*LedgerCleanerRequest) Method() string {
 	return "ledger_cleaner"
 }
+
+func (*LedgerCleanerRequest) Validate() error {
+	return nil
+}

model/client/admin/data/ledger_request_request.go

@@ -10,3 +10,7 @@ type LedgerRequestRequest struct {
 func (*LedgerRequest) Method() string {
 	return "ledger_request"
 }
+
+func (*LedgerRequest) Validate() error {
+	return nil
+}

model/client/admin/data/log_level_request.go

@@ -1,10 +1,25 @@
 package data
 
+const (
+	Fatal LogSeverity = "fatal"
+	Error LogSeverity = "error"
+	Warn  LogSeverity = "warn"
+	Info  LogSeverity = "info"
+	Debug LogSeverity = "debug"
+	Trace LogSeverity = "trace"
+)
+
+type LogSeverity string
+
 type LogLevelRequest struct {
-	Severity  string `json:"severity,omitempty"`
-	Partition string `json:"partition,omitempty"`
+	Severity  LogSeverity `json:"severity,omitempty"`
+	Partition string      `json:"partition,omitempty"`
 }
 
 func (*LogLevelRequest) Method() string {
 	return "log_level"
 }
+
+func (*LogLevelRequest) Validate() error {
+	return nil
+}

model/client/admin/data/logrotate_request.go

@@ -6,3 +6,7 @@ type LogrotateRequest struct {
 func (*LogrotateRequest) Method() string {
 	return "logrotate"
 }
+
+func (*LogrotateRequest) Validate() error {
+	return nil
+}