differentiate signer from signer entry

xyield · May 26, 2023 · 6c0f486 · 6c0f486
1 parent 77f9600
commit 6c0f486
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 26 deletions.
diff --git a/model/client/account/account_objects_test.go b/model/client/account/account_objects_test.go
@@ -36,7 +36,7 @@ func TestAccountObjectsResponse(t *testing.T) {
 				PreviousTxnID:     "abc",
 				PreviousTxnLgrSeq: 123,
 				OwnerNode:         "bob",
-				SignerEntries:     []ledger.SignerEntry{},
+				SignerEntries:     []ledger.SignerEntryWrapper{},
 				SignerListID:      213,
 				SignerQuorum:      0,
 			},

diff --git a/model/ledger/signer_entry.go b/model/ledger/signer_entry.go
diff --git a/model/ledger/signer_list.go b/model/ledger/signer_list.go
@@ -1,5 +1,7 @@
 package ledger
 
+import "github.com/xyield/xrpl-go/model/transactions/types"
+
 type SignerListFlags uint32
 
 const (
@@ -12,11 +14,21 @@ type SignerList struct {
 	PreviousTxnID     string
 	PreviousTxnLgrSeq uint64
 	OwnerNode         string
-	SignerEntries     []SignerEntry
+	SignerEntries     []SignerEntryWrapper
 	SignerListID      uint64
 	SignerQuorum      uint64
 }
 
+type SignerEntryWrapper struct {
+	SignerEntry SignerEntry
+}
+
+type SignerEntry struct {
+	Account       types.Address
+	SignerWeight  uint64
+	WalletLocator types.Hash256 `json:",omitempty"`
+}
+
 func (*SignerList) EntryType() LedgerEntryType {
 	return SignerListEntry
 }
diff --git a/model/ledger/signer_list_test.go b/model/ledger/signer_list_test.go
@@ -13,21 +13,21 @@ func TestSignerList(t *testing.T) {
 		OwnerNode:         "0000000000000000",
 		PreviousTxnID:     "5904C0DC72C58A83AEFED2FFC5386356AA83FCA6A88C89D00646E51E687CDBE4",
 		PreviousTxnLgrSeq: 16061435,
-		SignerEntries: []SignerEntry{
+		SignerEntries: []SignerEntryWrapper{
 			{
-				SignerEntry: Signer{
+				SignerEntry: SignerEntry{
 					Account:      "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW",
 					SignerWeight: 2,
 				},
 			},
 			{
-				SignerEntry: Signer{
+				SignerEntry: SignerEntry{
 					Account:      "raKEEVSGnKSD9Zyvxu4z6Pqpm4ABH8FS6n",
 					SignerWeight: 1,
 				},
 			},
 			{
-				SignerEntry: Signer{
+				SignerEntry: SignerEntry{
 					Account:      "rUpy3eEg8rqjqfUoLeBnZkscbKbFsKXC3v",
 					SignerWeight: 1,
 				},

diff --git a/model/transactions/signer_list_set.go b/model/transactions/signer_list_set.go
@@ -7,7 +7,7 @@ import (
 type SignerListSet struct {
 	BaseTx
 	SignerQuorum  uint
-	SignerEntries []ledger.SignerEntry
+	SignerEntries []ledger.SignerEntryWrapper
 }
 
 func (*SignerListSet) TxType() TxType {

diff --git a/model/transactions/signer_list_set_test.go b/model/transactions/signer_list_set_test.go
@@ -18,21 +18,21 @@ func TestSignerListSetTx(t *testing.T) {
 			Fee:             types.XRPCurrencyAmount(12),
 		},
 		SignerQuorum: 3,
-		SignerEntries: []ledger.SignerEntry{
+		SignerEntries: []ledger.SignerEntryWrapper{
 			{
-				SignerEntry: ledger.Signer{
+				SignerEntry: ledger.SignerEntry{
 					Account:      "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW",
 					SignerWeight: 2,
 				},
 			},
 			{
-				SignerEntry: ledger.Signer{
+				SignerEntry: ledger.SignerEntry{
 					Account:      "rUpy3eEg8rqjqfUoLeBnZkscbKbFsKXC3v",
 					SignerWeight: 1,
 				},
 			},
 			{
-				SignerEntry: ledger.Signer{
+				SignerEntry: ledger.SignerEntry{
 					Account:      "raKEEVSGnKSD9Zyvxu4z6Pqpm4ABH8FS6n",
 					SignerWeight: 1,
 				},