fix nits

ava-labs · Jun 21, 2024 · 68b525a · 68b525a
1 parent 307ce16
commit 68b525a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/chain/transaction.go b/chain/transaction.go
@@ -467,11 +467,7 @@ func UnmarshalTx(
 		return nil, fmt.Errorf("%w: sponsorType (%d) did not match authType (%d)", ErrInvalidSponsor, sponsorType, authType)
 	}
 
-	var tx Transaction
-	tx.Timestamp = timestamp
-	tx.ChainID = chainID
-	tx.MaximumFee = maxFee
-	tx.Actions = actions
+	tx := NewTx(timestamp, chainID, maxFee, actions)
 	tx.Auth = auth
 	if err := p.Err(); err != nil {
 		return nil, p.Err()
@@ -481,7 +477,7 @@ func UnmarshalTx(
 	tx.bytes = codecBytes[start:p.Offset()] // ensure errors handled before grabbing memory
 	tx.size = len(tx.bytes)
 	tx.id = utils.ToID(tx.bytes)
-	return &tx, nil
+	return tx, nil
 }
 
 func unmarshalActions(

diff --git a/cli/spam.go b/cli/spam.go
@@ -471,8 +471,8 @@ type timeModifier struct {
 	Timestamp int64
 }
 
-func (t *timeModifier) Base(b *chain.Transaction) {
-	b.Timestamp = t.Timestamp
+func (t *timeModifier) Base(timestamp *int64, chainID *ids.ID, maxFee *uint64) {
+	t.Timestamp = t.Timestamp
 }
 
 func startIssuer(cctx context.Context, issuer *txIssuer) {

diff --git a/gossiper/manual.go b/gossiper/manual.go
@@ -49,7 +49,7 @@ func (g *Manual) Force(ctx context.Context) error {
 		g.vm.GetTargetGossipDuration(),
 		func(_ context.Context, next *chain.Transaction) (cont bool, rest bool, err error) {
 			// Remove txs that are expired
-			if next.Timestamp < now {
+			if next.Expiry() < now {
 				return true, false, nil
 			}
 

diff --git a/gossiper/proposer.go b/gossiper/proposer.go
@@ -119,12 +119,12 @@ func (g *Proposer) Force(ctx context.Context) error {
 		g.vm.GetTargetGossipDuration(),
 		func(_ context.Context, next *chain.Transaction) (cont bool, rest bool, err error) {
 			// Remove txs that are expired
-			if next.Timestamp < now {
+			if next.Expiry() < now {
 				return true, false, nil
 			}
 
 			// Don't gossip txs that are about to expire
-			life := next.Timestamp - now
+			life := next.Expiry() - now
 			if life < g.cfg.GossipMinLife {
 				return true, true, nil
 			}

diff --git a/rpc/jsonrpc_client.go b/rpc/jsonrpc_client.go
@@ -116,7 +116,7 @@ func (cli *JSONRPCClient) SubmitTx(ctx context.Context, d []byte) (ids.ID, error
 }
 
 type Modifier interface {
-	Base(*int64, *ids.ID, *uint64)
+	Base(timestamp *int64, chainID *ids.ID, maxFee *uint64)
 }
 
 func (cli *JSONRPCClient) GenerateTransaction(