resolved conflicts

2021-06-30 13:16:52 +02:00
parent 9ec7cd7239 ed2d7964ad
commit 4f0a96c9c7
114 changed files with 7417 additions and 1212 deletions
@@ -202,7 +202,7 @@ var LibP2P = Options(
 	Override(ConnGaterKey, lp2p.ConnGaterOption),
 )

-func isType(t repo.RepoType) func(s *Settings) bool {
+func IsType(t repo.RepoType) func(s *Settings) bool {
 	return func(s *Settings) bool { return s.nodeType == t }
 }

@@ -220,7 +220,7 @@ func Base(r repo.Repo) Option {
 		ApplyIfEnableLibP2P(r, LibP2P),

 		ApplyIf(isFullOrLiteNode, ChainNode),
-		ApplyIf(isType(repo.StorageMiner), MinerNode),
+		ApplyIf(IsType(repo.StorageMiner), MinerNode),
 	)
 }

@@ -336,8 +336,8 @@ func Repo(r repo.Repo) Option {

 			Override(new(*dtypes.APIAlg), modules.APISecret),

-			ApplyIf(isType(repo.FullNode), ConfigFullNode(c)),
-			ApplyIf(isType(repo.StorageMiner), ConfigStorageMiner(c)),
+			ApplyIf(IsType(repo.FullNode), ConfigFullNode(c)),
+			ApplyIf(IsType(repo.StorageMiner), ConfigStorageMiner(c)),
 		)(settings)
 	}
 }