From 52a0c90cd62a990c86746c13454d2bfa8a001200 Mon Sep 17 00:00:00 2001
From: Matt Jaffee <matthew.jaffee@gmail.com>
Date: Tue, 2 Mar 2021 15:06:21 -0600
Subject: [PATCH] change default backend to RBF, remove separate RBF race
 target

---
 .circleci/config.yml | 2 +-
 storage/config.go    | 2 +-
 tx_test.go           | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef6b7ce80..d31f1255e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -218,7 +218,7 @@ workflows:
             - setup
           matrix:
             parameters:
-              test_make_target: ["test-race", "test-txstore-rbf", "test-txstore-rbf_bolt"]
+              test_make_target: ["test-race", "test-txstore-rbf_bolt"]
       - test:
           name: test-shardwidth-22
           shard_width: "22"
diff --git a/storage/config.go b/storage/config.go
index 68137a878..e578ab9b9 100644
--- a/storage/config.go
+++ b/storage/config.go
@@ -23,7 +23,7 @@ const (
 
 // DefaultBackend is set here. pilosa/server/config.go references it
 // to set the default for pilosa server exeutable.
-const DefaultBackend = RoaringBackend
+const DefaultBackend = RBFBackend
 
 // Config represents configuration which applies to multiple storage engines.
 type Config struct {
diff --git a/tx_test.go b/tx_test.go
index 00bec7e7a..60e32c906 100644
--- a/tx_test.go
+++ b/tx_test.go
@@ -61,9 +61,7 @@ func queryBalances(m0api *pilosa.API, acctOwnerID uint64, fldAcct0, fldAcct1, in
 
 func skipForRoaring(t *testing.T) {
 	src := pilosa.CurrentBackend()
-	// once txfactory.go storage.DefaultBackend != RoaringTxn, this
-	// will break, of course. Take out the src == "" below.
-	if (src == "" && storage.DefaultBackend == pilosa.RoaringTxn) || strings.Contains(src, "roaring") {
+	if (storage.DefaultBackend == pilosa.RoaringTxn) || strings.Contains(src, "roaring") {
 		t.Skip("skip if roaring pseudo-txn involved -- won't show transactional rollback")
 	}
 }