merged main

kwilteam · Nov 9, 2023 · 62674f2 · 62674f2
1 parent f2b5f7b
commit 62674f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/internal/validators/mgr.go b/internal/validators/mgr.go
@@ -157,20 +157,12 @@ func (vm *ValidatorMgr) candidate(val []byte) *joinReq {
 }
 func NewValidatorMgr(ctx context.Context, datastore Datastore, committable Committable, opts ...ValidatorMgrOpt) (*ValidatorMgr, error) {
 	vm := &ValidatorMgr{
-<<<<<<< HEAD
-		current:    make(map[string]struct{}),
-		candidates: make(map[string]*joinReq),
-		removals:   make(map[string]map[string]bool),
-		log:        log.NewNoOp(),
-		joinExpiry: 14400, // really should *always* come from opts in production to match consensus config
-=======
 		current:     make(map[string]struct{}),
 		candidates:  make(map[string]*joinReq),
 		removals:    make(map[string]map[string]bool),
 		log:         log.NewNoOp(),
-		joinExpiry:  86400,
+		joinExpiry:  14400, // really should *always* come from opts in production to match consensus config
 		committable: committable,
->>>>>>> 245a0434 (kwild is building, acceptance tests not passing)
 	}
 	for _, opt := range opts {
 		opt(vm)

diff --git a/test/go.mod b/test/go.mod
@@ -14,11 +14,7 @@ require (
 	github.com/cometbft/cometbft v0.37.2
 	github.com/cstockton/go-conv v1.0.0
 	github.com/joho/godotenv v1.5.1
-<<<<<<< HEAD
 	github.com/kwilteam/kuneiform v0.5.0-beta.0.20231107213536-a9e67cab891d
-=======
-	github.com/kwilteam/kuneiform v0.5.0-beta.0.20231107174038-6cac79ae152c
->>>>>>> 484387a4 (ran tidy on all submodules)
 	github.com/kwilteam/kwil-db v0.5.1-0.20230927233025-c3e8ef579ade
 	github.com/kwilteam/kwil-db/core v0.0.0
 	github.com/stretchr/testify v1.8.4