Saving

cmd/devnet/commands/block.go

@@ -67,12 +67,16 @@ func callContractTx() (*common.Hash, error) {
 	fmt.Printf("SUCCESS => Tx submitted, adding tx with hash %q to txpool\n", hash)
 	fmt.Println()
 
+	checkTxPoolContent(1, 0)
+
 	_, err = services.SearchBlockForTransactionHash(*hash)
 	if err != nil {
 		return nil, fmt.Errorf("failed to find tx in block: %v", err)
 	}
 	fmt.Println()
 
+	checkTxPoolContent(1, 0)
+
 	if err := services.EmitFallbackEvent(models.ReqId, subscriptionContract, transactOpts, address); err != nil {
 		fmt.Printf("failed to emit events: %v\n", err)
 		return nil, err

cmd/devnet/commands/tx.go

@@ -16,10 +16,12 @@ func checkTxPoolContent(expectedPendingSize, expectedQueuedSize int) {
 
 	if pendingSize != expectedPendingSize {
 		fmt.Printf("FAILURE => %v\n", fmt.Errorf("expected %d transaction(s) in pending pool, got %d", expectedPendingSize, pendingSize))
+		return
 	}
 
 	if queuedSize != expectedQueuedSize {
 		fmt.Printf("FAILURE => %v\n", fmt.Errorf("expected %d transaction(s) in queued pool, got %d", expectedQueuedSize, queuedSize))
+		return
 	}
 
 	fmt.Printf("SUCCESS => %d transaction(s) in the pending pool and %d transaction(s) in the queued pool\n", pendingSize, queuedSize)

cmd/devnet/models/model.go

@@ -77,7 +77,7 @@ const (
 	// ReqId is the request id for each request
 	ReqId = 0
 	// MaxNumberOfBlockChecks is the max number of blocks to look for a transaction in
-	MaxNumberOfBlockChecks = 1
+	MaxNumberOfBlockChecks = 3
 
 	// Latest is the parameter for the latest block
 	Latest BlockNumber = "latest"