Update SubmitIntent handler interfaces

Author: Jeff Yanta

pkg/code/server/transaction/action_handler.go

@@ -68,11 +68,11 @@ type CreateActionHandler interface {
 		bh solana.Blockhash,
 	) (*newFulfillmentMetadata, error)
 
-	// OnSaveToDB is a callback when the action is being saved to the DB
+	// OnCommitToDB is a callback when the action is being committeds to the DB
 	// within the scope of a DB transaction. Additional supporting DB records
 	// (ie. not the action or fulfillment records) relevant to the action should
 	// be saved here.
-	OnSaveToDB(ctx context.Context) error
+	OnCommitToDB(ctx context.Context) error
 }
 
 type OpenAccountActionHandler struct {
@@ -172,7 +172,7 @@ func (h *OpenAccountActionHandler) GetFulfillmentMetadata(
 	}
 }
 
-func (h *OpenAccountActionHandler) OnSaveToDB(ctx context.Context) error {
+func (h *OpenAccountActionHandler) OnCommitToDB(ctx context.Context) error {
 	err := h.data.SaveTimelock(ctx, h.unsavedTimelockRecord)
 	if err != nil {
 		return err
@@ -301,7 +301,7 @@ func (h *NoPrivacyTransferActionHandler) GetFulfillmentMetadata(
 	}
 }
 
-func (h *NoPrivacyTransferActionHandler) OnSaveToDB(ctx context.Context) error {
+func (h *NoPrivacyTransferActionHandler) OnCommitToDB(ctx context.Context) error {
 	return nil
 }
 
@@ -416,6 +416,6 @@ func (h *NoPrivacyWithdrawActionHandler) GetFulfillmentMetadata(
 	}
 }
 
-func (h *NoPrivacyWithdrawActionHandler) OnSaveToDB(ctx context.Context) error {
+func (h *NoPrivacyWithdrawActionHandler) OnCommitToDB(ctx context.Context) error {
 	return nil
 }

pkg/code/server/transaction/intent.go

@@ -598,13 +598,6 @@ func (s *transactionServer) SubmitIntent(streamer transactionpb.Transaction_Subm
 			return err
 		}
 
-		// Save additional state related to the intent
-		err = intentHandler.OnSaveToDB(ctx, intentRecord)
-		if err != nil {
-			log.WithError(err).Warn("failure executing intent db save callback")
-			return err
-		}
-
 		// Save all actions
 		err = s.data.PutAllActions(ctx, actionRecords...)
 		if err != nil {
@@ -614,7 +607,7 @@ func (s *transactionServer) SubmitIntent(streamer transactionpb.Transaction_Subm
 
 		// Save additional state related to each action
 		for _, actionHandler := range actionHandlers {
-			err = actionHandler.OnSaveToDB(ctx)
+			err = actionHandler.OnCommitToDB(ctx)
 			if err != nil {
 				log.WithError(err).Warn("failure executing action db save callback handler")
 				return err
@@ -673,13 +666,6 @@ func (s *transactionServer) SubmitIntent(streamer transactionpb.Transaction_Subm
 
 	log.Debug("intent submitted")
 
-	// Post-processing when an intent has been committed to the DB.
-
-	err = intentHandler.OnCommittedToDB(ctx, intentRecord)
-	if err != nil {
-		log.WithError(err).Warn("failure executing intent committed callback handler handler")
-	}
-
 	// Fire off some success metrics
 	recordUserIntentCreatedEvent(ctx, intentRecord)
 

pkg/code/server/transaction/intent_handler.go

@@ -59,20 +59,6 @@ type CreateIntentHandler interface {
 
 	// AllowCreation determines whether the new intent creation should be allowed.
 	AllowCreation(ctx context.Context, intentRecord *intent.Record, metadata *transactionpb.Metadata, actions []*transactionpb.Action) error
-
-	// OnSaveToDB is a callback when the intent is being saved to the DB
-	// within the scope of a DB transaction. Additional supporting DB records
-	// (ie. not the intent record) relevant to the intent should be saved here.
-	OnSaveToDB(ctx context.Context, intentRecord *intent.Record) error
-
-	// OnCommittedToDB is a callback when the intent has been committed to the
-	// DB. Any instant side-effects should called here, and can be done async
-	// in a new goroutine to not affect SubmitIntent latency.
-	//
-	// Note: Any errors generated here have no effect on rolling back the intent.
-	//       This is all best-effort up to this point. Use a worker for things
-	//       requiring retries!
-	OnCommittedToDB(ctx context.Context, intentRecord *intent.Record) error
 }
 
 type OpenAccountsIntentHandler struct {
@@ -294,14 +280,6 @@ func (h *OpenAccountsIntentHandler) validateActions(
 	return nil
 }
 
-func (h *OpenAccountsIntentHandler) OnSaveToDB(ctx context.Context, intentRecord *intent.Record) error {
-	return nil
-}
-
-func (h *OpenAccountsIntentHandler) OnCommittedToDB(ctx context.Context, intentRecord *intent.Record) error {
-	return nil
-}
-
 type SendPublicPaymentIntentHandler struct {
 	conf          *conf
 	data          code_data.Provider
@@ -791,14 +769,6 @@ func (h *SendPublicPaymentIntentHandler) validateActions(
 	return nil
 }
 
-func (h *SendPublicPaymentIntentHandler) OnSaveToDB(ctx context.Context, intentRecord *intent.Record) error {
-	return nil
-}
-
-func (h *SendPublicPaymentIntentHandler) OnCommittedToDB(ctx context.Context, intentRecord *intent.Record) error {
-	return nil
-}
-
 type ReceivePaymentsPubliclyIntentHandler struct {
 	conf          *conf
 	data          code_data.Provider
@@ -1084,14 +1054,6 @@ func (h *ReceivePaymentsPubliclyIntentHandler) validateActions(
 	return validateMoneyMovementActionUserAccounts(intent.ReceivePaymentsPublicly, initiatorAccountsByVault, actions)
 }
 
-func (h *ReceivePaymentsPubliclyIntentHandler) OnSaveToDB(ctx context.Context, intentRecord *intent.Record) error {
-	return nil
-}
-
-func (h *ReceivePaymentsPubliclyIntentHandler) OnCommittedToDB(ctx context.Context, intentRecord *intent.Record) error {
-	return nil
-}
-
 type PublicDistributionIntentHandler struct {
 	conf          *conf
 	data          code_data.Provider
@@ -1380,14 +1342,6 @@ func (h *PublicDistributionIntentHandler) validateActions(
 	return nil
 }
 
-func (h *PublicDistributionIntentHandler) OnSaveToDB(ctx context.Context, intentRecord *intent.Record) error {
-	return nil
-}
-
-func (h *PublicDistributionIntentHandler) OnCommittedToDB(ctx context.Context, intentRecord *intent.Record) error {
-	return nil
-}
-
 func validateAllUserAccountsManagedByCode(ctx context.Context, initiatorAccounts []*common.AccountRecords) error {
 	// Try to unlock *ANY* latest account, and you're done
 	for _, accountRecords := range initiatorAccounts {