uncommited changes and strategy operators moved to subfolder

api/censuses.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/vocdoni/census3/api/strategyoperators"
 	"github.com/vocdoni/census3/census"
 	queries "github.com/vocdoni/census3/db/sqlc"
 	"github.com/vocdoni/census3/lexer"
@@ -139,7 +140,7 @@ func (capi *census3API) createAndPublishCensus(req *CreateCensusRequest, qID str
 	censusWeight := new(big.Int)
 	strategyHolders := map[common.Address]*big.Int{}
 	// parse the predicate
-	lx := lexer.NewLexer(ValidOperatorsTags)
+	lx := lexer.NewLexer(strategyoperators.ValidOperatorsTags)
 	validPredicate, err := lx.Parse(strategy.Predicate)
 	if err != nil {
 		return 0, ErrInvalidStrategyPredicate.WithErr(err)
@@ -174,16 +175,16 @@ func (capi *census3API) createAndPublishCensus(req *CreateCensusRequest, qID str
 			return 0, ErrCantCreateCensus.WithErr(err)
 		}
 		// parse token information
-		tokensInfo := map[string]*StrategyToken{}
+		tokensInfo := map[string]*strategyoperators.TokenInformation{}
 		for _, token := range strategyTokens {
-			tokensInfo[token.Symbol.String] = &StrategyToken{
+			tokensInfo[token.Symbol.String] = &strategyoperators.TokenInformation{
 				ID:         common.BytesToAddress(token.ID).String(),
 				ChainID:    token.ChainID,
 				MinBalance: new(big.Int).SetBytes(token.MinBalance).String(),
 			}
 		}
 		// init the operators and the predicate evaluator
-		operators := InitOperators(capi.db.QueriesRO, tokensInfo)
+		operators := strategyoperators.InitOperators(capi.db.QueriesRO, tokensInfo)
 		eval := lexer.NewEval[[]string](operators.Map())
 		// execute the evaluation of the predicate
 		res, err := eval.EvalToken(validPredicate)

api/strategies.go

@@ -9,6 +9,7 @@ import (
 	"strconv"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/vocdoni/census3/api/strategyoperators"
 	queries "github.com/vocdoni/census3/db/sqlc"
 	"github.com/vocdoni/census3/lexer"
 	"go.vocdoni.io/dvote/httprouter"
@@ -104,7 +105,7 @@ func (capi *census3API) createStrategy(msg *api.APIdata, ctx *httprouter.HTTPCon
 		return ErrMalformedStrategy.With("no predicate or alias provided")
 	}
 	// check predicate
-	lx := lexer.NewLexer(ValidOperatorsTags)
+	lx := lexer.NewLexer(strategyoperators.ValidOperatorsTags)
 	validatedPredicate, err := lx.Parse(req.Predicate)
 	if err != nil {
 		return ErrInvalidStrategyPredicate.WithErr(err)
@@ -293,7 +294,7 @@ func (capi *census3API) validateStrategyPredicate(msg *api.APIdata, ctx *httprou
 		return ErrMalformedStrategy.With("no predicate provided")
 	}
 
-	lx := lexer.NewLexer(ValidOperatorsTags)
+	lx := lexer.NewLexer(strategyoperators.ValidOperatorsTags)
 	resultingToken, err := lx.Parse(req.Predicate)
 	if err != nil {
 		return ErrInvalidStrategyPredicate.WithErr(err)

api/operators.go → api/strategyoperators/operators.go

@@ -1,4 +1,4 @@
-package api
+package strategyoperators
 
 import (
 	"context"
@@ -21,17 +21,23 @@ const (
 // ValidOperatorsTags variable contains the supported operator tags
 var ValidOperatorsTags = []string{ANDTag, ORTag}
 
+type TokenInformation struct {
+	ID         string
+	ChainID    uint64
+	MinBalance string
+}
+
 // StrategyOperators struct represents a custom set of predicate operators
 // associated with a SQL database as data source. It brings access to SQL data
 // inside the lexer evaluator operators.
 type StrategyOperators struct {
 	db         *queries.Queries
-	tokensInfo map[string]*StrategyToken
+	tokensInfo map[string]*TokenInformation
 }
 
 // InitOperators function creates a new StrategyOperators struct with the db
 // instance and info about tokens provided.
-func InitOperators(db *queries.Queries, info map[string]*StrategyToken) *StrategyOperators {
+func InitOperators(db *queries.Queries, info map[string]*TokenInformation) *StrategyOperators {
 	return &StrategyOperators{
 		db:         db,
 		tokensInfo: info,
@@ -250,7 +256,7 @@ func (op *StrategyOperators) OR(iter *lexer.Iteration[[]string]) ([]string, erro
 			dataB = append(dataB, common.BytesToAddress(r).String())
 		}
 	}
-	// when both data sources are filled, do the intersection of both lists.
+	// when both data sources are filled, do the union of both lists.
 	res := append([]string{}, dataA...)
 	for _, addressA := range dataA {
 		for _, addressB := range dataB {

db/queries/tokenTypes.sql

@@ -0,0 +1,26 @@
+-- name: ListTokenTypes :many
+SELECT * FROM token_types
+ORDER BY id;
+
+-- name: TokenTypeByID :one
+SELECT * FROM token_types
+WHERE id = ?
+LIMIT 1;
+
+-- name: TokenTypeByName :one
+SELECT * FROM token_types
+WHERE type_name = ?
+LIMIT 1;
+
+-- name: CreateTokenType :execresult
+INSERT INTO token_types (type_name)
+VALUES (?);
+
+-- name: UpdateTokenType :execresult
+UPDATE token_types
+SET type_name = sqlc.arg(type_name)
+WHERE id = sqlc.arg(id);
+
+-- name: DeleteTokenType :execresult
+DELETE FROM token_types
+WHERE id = ?;