embed the allowlist into boundedblockservice

blockservice/blockservice.go

@@ -67,12 +67,11 @@ type BlockService interface {
 // BoundedBlockService is a Blockservice bounded via strict multihash Allowlist.
 type BoundedBlockService interface {
 	BlockService
-
-	Allowlist() verifcid.Allowlist
+	verifcid.Allowlist
 }
 
 type blockService struct {
-	allowlist  verifcid.Allowlist
+	verifcid.Allowlist
 	blockstore blockstore.Blockstore
 	exchange   exchange.Interface
 	// If checkFirst is true then first check that a block doesn't
@@ -93,7 +92,7 @@ func WriteThrough() Option {
 // WithAllowlist sets a custom [verifcid.Allowlist] which will be used
 func WithAllowlist(allowlist verifcid.Allowlist) Option {
 	return func(bs *blockService) {
-		bs.allowlist = allowlist
+		bs.Allowlist = allowlist
 	}
 }
 
@@ -104,7 +103,7 @@ func New(bs blockstore.Blockstore, exchange exchange.Interface, opts ...Option)
 	}
 
 	service := &blockService{
-		allowlist:  verifcid.DefaultAllowlist,
+		Allowlist:  verifcid.DefaultAllowlist,
 		blockstore: bs,
 		exchange:   exchange,
 		checkFirst: true,
@@ -135,19 +134,15 @@ func (s *blockService) Exchange() exchange.Interface {
 	return s.exchange
 }
 
-func (s *blockService) Allowlist() verifcid.Allowlist {
-	return s.allowlist
-}
-
 // NewSession creates a new session that allows for
 // controlled exchange of wantlists to decrease the bandwidth overhead.
 // If the current exchange is a SessionExchange, a new exchange
 // session will be created. Otherwise, the current exchange will be used
 // directly.
 func NewSession(ctx context.Context, bs BlockService) *Session {
-	allowlist := verifcid.DefaultAllowlist
+	allowlist := verifcid.Allowlist(verifcid.DefaultAllowlist)
 	if bbs, ok := bs.(BoundedBlockService); ok {
-		allowlist = bbs.Allowlist()
+		allowlist = bbs
 	}
 	exch := bs.Exchange()
 	if sessEx, ok := exch.(exchange.SessionExchange); ok {
@@ -175,7 +170,7 @@ func (s *blockService) AddBlock(ctx context.Context, o blocks.Block) error {
 	defer span.End()
 
 	c := o.Cid()
-	err := verifcid.ValidateCid(s.allowlist, c) // hash security
+	err := verifcid.ValidateCid(s.Allowlist, c) // hash security
 	if err != nil {
 		return err
 	}
@@ -206,7 +201,7 @@ func (s *blockService) AddBlocks(ctx context.Context, bs []blocks.Block) error {
 
 	// hash security
 	for _, b := range bs {
-		err := verifcid.ValidateCid(s.allowlist, b.Cid())
+		err := verifcid.ValidateCid(s.Allowlist, b.Cid())
 		if err != nil {
 			return err
 		}
@@ -256,7 +251,7 @@ func (s *blockService) GetBlock(ctx context.Context, c cid.Cid) (blocks.Block, e
 		f = s.getExchange
 	}
 
-	return getBlock(ctx, c, s.blockstore, s.allowlist, f)
+	return getBlock(ctx, c, s.blockstore, s.Allowlist, f)
 }
 
 func (s *blockService) getExchange() notifiableFetcher {
@@ -313,7 +308,7 @@ func (s *blockService) GetBlocks(ctx context.Context, ks []cid.Cid) <-chan block
 		f = s.getExchange
 	}
 
-	return getBlocks(ctx, ks, s.blockstore, s.allowlist, f)
+	return getBlocks(ctx, ks, s.blockstore, s.Allowlist, f)
 }
 
 func getBlocks(ctx context.Context, ks []cid.Cid, bs blockstore.Blockstore, allowlist verifcid.Allowlist, fget func() notifiableFetcher) <-chan blocks.Block {

verifcid/allowlist.go

@@ -5,7 +5,7 @@ import (
 )
 
 // DefaultAllowlist is the default list of hashes allowed in IPFS.
-var DefaultAllowlist Allowlist = defaultAllowlist{}
+var DefaultAllowlist defaultAllowlist
 
 // Allowlist defines an interface containing list of allowed multihashes.
 type Allowlist interface {