Simplify da backend stores around Redis

flashbots · Sep 29, 2023 · b98a2d8 · b98a2d8
1 parent 753278b
commit b98a2d8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 324 deletions.
diff --git a/eth/backend.go b/eth/backend.go
@@ -232,15 +232,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	eth.miner = miner.New(eth, &config.Miner, eth.blockchain.Config(), eth.EventMux(), eth.engine, eth.isLocalBlock)
 	eth.miner.SetExtra(makeExtraData(config.Miner.ExtraData))
 
-	// TODO: opts, redis store backend
-	var confidentialStoreBackend suave.ConfidentialStoreBackend
-	if config.Suave.RedisStoreUri == "dev" {
-		confidentialStoreBackend = suave_backends.NewMiniredisBackend()
-	} else if config.Suave.RedisStoreUri != "" {
-		confidentialStoreBackend = suave_backends.NewRedisStoreBackend(config.Suave.RedisStoreUri)
-	} else {
-		confidentialStoreBackend = suave_backends.NewLocalConfidentialStore()
-	}
+	confidentialStoreBackend := suave_backends.NewRedisStoreBackend(config.Suave.RedisStoreUri)
 
 	var confidentialStoreTransport suave.StoreTransportTopic
 	if config.Suave.RedisStorePubsubUri != "" {

diff --git a/suave/backends/cdas.go b/suave/backends/cdas.go
diff --git a/suave/backends/miniredis_backends.go b/suave/backends/miniredis_backends.go
diff --git a/suave/backends/redis_backends_test.go b/suave/backends/redis_backends_test.go
@@ -13,81 +13,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestMiniredisTransport(t *testing.T) {
-	mb := NewMiniredisBackend()
-	require.NoError(t, mb.Start())
-	t.Cleanup(func() { mb.Stop() })
-
-	msgSub, cancel := mb.Subscribe()
-	t.Cleanup(cancel)
-
-	daMsg := suave.DAMessage{
-		Bid: suave.Bid{
-			Id:                  suave.BidId{0x42},
-			DecryptionCondition: uint64(13),
-			AllowedPeekers:      []common.Address{{0x41, 0x39}},
-			Version:             string("vv"),
-		},
-		Value:     []byte{},
-		Signature: []byte{},
-	}
-
-	mb.Publish(daMsg)
-
-	select {
-	case msg := <-msgSub:
-		require.Equal(t, daMsg, msg)
-	case <-time.After(100 * time.Millisecond):
-		t.Error("did not receive expected message")
-	}
-
-	select {
-	case <-msgSub:
-		t.Error("received an expected message")
-	case <-time.After(5 * time.Millisecond):
-	}
-
-	daMsg.Bid.Id[0] = 0x43
-	mb.Publish(daMsg)
-
-	select {
-	case msg := <-msgSub:
-		require.Equal(t, daMsg, msg)
-	case <-time.After(100 * time.Millisecond):
-		t.Error("did not receive expected message")
-	}
-}
-
-func TestMiniredisStore(t *testing.T) {
-	mb := NewMiniredisBackend()
-	require.NoError(t, mb.Start())
-	t.Cleanup(func() { mb.Stop() })
-
-	bid := suave.Bid{
-		Id:                  suave.BidId{0x42},
-		DecryptionCondition: uint64(13),
-		AllowedPeekers:      []common.Address{{0x41, 0x39}},
-		Version:             string("vv"),
-	}
-
-	err := mb.InitializeBid(bid)
-	require.NoError(t, err)
-
-	fetchedBid, err := mb.FetchEngineBidById(bid.Id)
-	require.NoError(t, err)
-	require.Equal(t, bid, fetchedBid)
-
-	_, err = mb.Store(bid, bid.AllowedPeekers[0], "xx", []byte{0x43, 0x14})
-	require.NoError(t, err)
-
-	retrievedData, err := mb.Retrieve(bid, bid.AllowedPeekers[0], "xx")
-	require.NoError(t, err)
-	require.Equal(t, []byte{0x43, 0x14}, retrievedData)
-
-	_, err = mb.Retrieve(bid, bid.AllowedPeekers[0], "xxy")
-	require.Error(t, err)
-}
-
 func TestRedisTransport(t *testing.T) {
 	mr := miniredis.RunT(t)
 

diff --git a/suave/backends/redis_store_backend.go b/suave/backends/redis_store_backend.go
@@ -33,6 +33,10 @@ type RedisStoreBackend struct {
 	local    *miniredis.Miniredis
 }
 
+func NewLocalConfidentialStore() *RedisStoreBackend {
+	return NewRedisStoreBackend("")
+}
+
 func NewRedisStoreBackend(redisUri string) *RedisStoreBackend {
 	return &RedisStoreBackend{
 		cancel:   nil,