testutil,wallet: address review comments

testutil/wallet.go

@@ -72,7 +72,7 @@ func (et *ephemeralWalletUpdateTxn) RemoveSiacoinElements(ids []types.SiacoinOut
 }
 
 func (et *ephemeralWalletUpdateTxn) RevertIndex(index types.ChainIndex) error {
-	// remove any transactions that were added in the reverted block
+	// remove any events that were added in the reverted block
 	filtered := et.store.events[:0]
 	for i := range et.store.events {
 		if et.store.events[i].Index == index {
@@ -92,7 +92,7 @@ func (et *ephemeralWalletUpdateTxn) RevertIndex(index types.ChainIndex) error {
 }
 
 // WalletEvents returns the wallet's events.
-func (es *EphemeralWalletStore) WalletEvents(limit, offset int) ([]wallet.Event, error) {
+func (es *EphemeralWalletStore) WalletEvents(offset, limit int) ([]wallet.Event, error) {
 	es.mu.Lock()
 	defer es.mu.Unlock()
 

wallet/update.go

@@ -235,7 +235,7 @@ func ApplyChainUpdates(tx ApplyTx, address types.Address, updates []*chain.Apply
 	} else if err := tx.RemoveSiacoinElements(spentUTXOs); err != nil {
 		return fmt.Errorf("failed to remove siacoin elements: %w", err)
 	} else if err := tx.AddEvents(events); err != nil {
-		return fmt.Errorf("failed to add transactions: %w", err)
+		return fmt.Errorf("failed to add events: %w", err)
 	} else if err := tx.UpdateStateElements(stateElements); err != nil {
 		return fmt.Errorf("failed to update state elements: %w", err)
 	}

wallet/wallet.go

@@ -97,7 +97,7 @@ type (
 		// WalletEvents returns a paginated list of transactions ordered by
 		// maturity height, descending. If no more transactions are available,
 		// (nil, nil) should be returned.
-		WalletEvents(limit, offset int) ([]Event, error)
+		WalletEvents(offset, limit int) ([]Event, error)
 		// WalletEventCount returns the total number of events relevant to the
 		// wallet.
 		WalletEventCount() (uint64, error)
@@ -215,8 +215,8 @@ func (sw *SingleAddressWallet) Balance() (balance Balance, err error) {
 
 // Events returns a paginated list of events, ordered by maturity height, descending.
 // If no more events are available, (nil, nil) is returned.
-func (sw *SingleAddressWallet) Events(limit, offset int) ([]Event, error) {
-	return sw.store.WalletEvents(limit, offset)
+func (sw *SingleAddressWallet) Events(offset, limit int) ([]Event, error) {
+	return sw.store.WalletEvents(offset, limit)
 }
 
 // EventCount returns the total number of events relevant to the wallet.

wallet/wallet_test.go

@@ -68,7 +68,7 @@ func TestWallet(t *testing.T) {
 
 	maturityHeight := cm.TipState().MaturityHeight()
 	// check that the wallet has a single event
-	if events, err := w.Events(100, 0); err != nil {
+	if events, err := w.Events(0, 100); err != nil {
 		t.Fatal(err)
 	} else if len(events) != 1 {
 		t.Fatalf("expected 1 event, got %v", len(events))
@@ -107,7 +107,7 @@ func TestWallet(t *testing.T) {
 	}
 
 	// check that the payout transaction was created
-	events, err := w.Events(100, 0)
+	events, err := w.Events(0, 100)
 	if err != nil {
 		t.Fatal(err)
 	} else if len(events) != 1 {
@@ -195,7 +195,7 @@ func TestWallet(t *testing.T) {
 	}
 
 	// check that the paginated transactions are in the proper order
-	events, err = w.Events(100, 0)
+	events, err = w.Events(0, 100)
 	if err != nil {
 		t.Fatal(err)
 	} else if len(events) != 2 {
@@ -213,7 +213,6 @@ func TestWallet(t *testing.T) {
 		sent[i].SiacoinOutputs = []types.SiacoinOutput{
 			{Address: types.VoidAddress, Value: sendAmount},
 		}
-
 		toSign, err := w.FundTransaction(&sent[i], sendAmount, false)
 		if err != nil {
 			t.Fatal(err)
@@ -246,7 +245,7 @@ func TestWallet(t *testing.T) {
 	}
 
 	// check that the paginated transactions are in the proper order
-	events, err = w.Events(20, 0) // limit of 20 so the original two transactions are not included
+	events, err = w.Events(0, 20) // limit of 20 so the original two transactions are not included
 	if err != nil {
 		t.Fatal(err)
 	} else if len(events) != 20 {