rlps: refactor. remove e2pg dep

e2pg/e2pg.go

@@ -494,7 +494,7 @@ func (g *Geth) Latest() (uint64, []byte, error) {
 	return bint.Uint64(n), h, nil
 }
 
-func Skip(filter [][]byte, bf bloom.Filter) bool {
+func skip(filter [][]byte, bf bloom.Filter) bool {
 	if len(filter) == 0 {
 		return false
 	}
@@ -513,7 +513,7 @@ func (g *Geth) LoadBlocks(filter [][]byte, bfs []geth.Buffer, blks []eth.Block)
 	}
 	for i := range blks {
 		blks[i].Header.UnmarshalRLP(bfs[i].Header())
-		if Skip(filter, bloom.Filter(blks[i].Header.LogsBloom)) {
+		if skip(filter, bloom.Filter(blks[i].Header.LogsBloom)) {
 			continue
 		}
 		//rlp contains: [transactions,uncles]

rlps/rlps.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/indexsupply/x/bint"
 	"github.com/indexsupply/x/bloom"
-	"github.com/indexsupply/x/e2pg"
 	"github.com/indexsupply/x/eth"
 	"github.com/indexsupply/x/freezer"
 	"github.com/indexsupply/x/geth"
@@ -181,7 +180,7 @@ func (s *Server) get(filter [][]byte, n, limit uint64) ([]byte, error) {
 		block := eth.Block{}
 		block.UnmarshalRLP(hrlp)
 		switch {
-		case e2pg.Skip(filter, bloom.Filter(block.LogsBloom)):
+		case skip(filter, bloom.Filter(block.LogsBloom)):
 			res[i] = rlp.List(rlp.Encode(hrlp, zero, zero))
 		default:
 			res[i] = rlp.List(rlp.Encode(
@@ -194,6 +193,18 @@ func (s *Server) get(filter [][]byte, n, limit uint64) ([]byte, error) {
 	return rlp.List(res...), nil
 }
 
+func skip(filter [][]byte, bf bloom.Filter) bool {
+	if len(filter) == 0 {
+		return false
+	}
+	for i := range filter {
+		if !bf.Missing(filter[i]) {
+			return false
+		}
+	}
+	return true
+}
+
 func (s *Server) Index(w http.ResponseWriter, r *http.Request) {
 	num, hash, err := geth.Latest(s.rc)
 	if err != nil {