Merge pull request #7705 from MinaProtocol/fix/txn-pool-expiry

Fix error when expired transactions are replaced in the pool
MinaProtocol · Jan 27, 2021 · d075f83 · d075f83
2 parents 23080f4 + d788aba
commit d075f83
Showing 1 changed file with 3 additions and 20 deletions.
diff --git a/src/lib/network_pool/indexed_pool.ml b/src/lib/network_pool/indexed_pool.ml
@@ -77,17 +77,6 @@ module Command_error = struct
   [@@deriving sexp_of, to_yojson]
 end
 
-exception Command_error of Command_error.t
-
-let () =
-  Sexplib.Conv.Exn_converter.add [%extension_constructor Command_error]
-    (function
-    | Command_error t ->
-        Sexp.List [Sexp.Atom "Command_error"; Command_error.sexp_of_t t]
-    | _ ->
-        (* Reaching this branch indicates a bug in sexplib. *)
-        assert false )
-
 (* Compute the total currency required from the sender to execute a command.
    Returns None in case of overflow.
 *)
@@ -905,12 +894,8 @@ let rec add_from_gossip_exn :
               (* We've already removed them, so this should always be empty. *)
               assert (Sequence.is_empty dropped') ;
               Result.Ok (v, t'', dropped)
-          | Error ((Insufficient_funds _ | Overflow) as err) ->
-              Error err
-              (* C2 *)
-              (* C4 *)
           | Error err ->
-              raise (Command_error err)
+              Error err
         in
         let drop_head, drop_tail = Option.value_exn (Sequence.next dropped) in
         let increment =
@@ -949,13 +934,11 @@ let rec add_from_gossip_exn :
                 | Ok (_v, t', dropped_) ->
                     assert (Sequence.is_empty dropped_) ;
                     go t' increment dropped' None current_nonce
-                | Error (Insufficient_funds _) ->
+                | Error _err ->
                     (* Re-evaluate with the same [dropped] to calculate the new
                        fee increment.
                     *)
-                    go t' increment dropped (Some dropped') current_nonce
-                | Error err ->
-                    raise (Command_error err) )
+                    go t' increment dropped (Some dropped') current_nonce )
           in
           go t'' increment drop_tail None current_nonce
         in