LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Use fully static linkage #364

Closed
bvbfan wants to merge 78 commits from static_link into master
pull from: static_link
merge into: LBRYCommunity:master
Conversation 2 Commits 78 Files changed 312 +6 -3
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0bc44cac0e - Show all commits

4
src/init.cpp
View file

@ -1458,8 +1458,10 @@ bool AppInitMain()
auto& consensus = chainparams.GetConsensus(); auto& consensus = chainparams.GetConsensus();
if (g_logger->Enabled() && LogAcceptCategory(BCLog::CLAIMS)) if (g_logger->Enabled() && LogAcceptCategory(BCLog::CLAIMS))
CLogPrint::global().setLogger(g_logger); CLogPrint::global().setLogger(g_logger);
auto dataDir = GetDataDir() / "claimtrie";
TryCreateDirectories(dataDir);
pclaimTrie = new CClaimTrie(fReindex || fReindexChainState, 0, pclaimTrie = new CClaimTrie(fReindex || fReindexChainState, 0,
(GetDataDir() / "claimtrie").string(), dataDir.string(),
consensus.nNormalizedNameForkHeight, consensus.nNormalizedNameForkHeight,
consensus.nOriginalClaimExpirationTime, consensus.nOriginalClaimExpirationTime,
consensus.nExtendedClaimExpirationTime, consensus.nExtendedClaimExpirationTime,

5
src/test/test_bitcoin.cpp
View file

@ -148,8 +148,9 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
pcoinsdbview.reset(new CCoinsViewDB(1 << 23, true)); pcoinsdbview.reset(new CCoinsViewDB(1 << 23, true));
pcoinsTip.reset(new CCoinsViewCache(pcoinsdbview.get())); pcoinsTip.reset(new CCoinsViewCache(pcoinsdbview.get()));
auto& consensus = chainparams.GetConsensus(); auto& consensus = chainparams.GetConsensus();
pclaimTrie = new CClaimTrie(true, 0, auto dataDir = GetDataDir() / "claimtrie";
(GetDataDir() / "claimtrie").string(), TryCreateDirectories(dataDir);
pclaimTrie = new CClaimTrie(true, 0, dataDir.string(),
consensus.nNormalizedNameForkHeight, consensus.nNormalizedNameForkHeight,
consensus.nOriginalClaimExpirationTime, consensus.nOriginalClaimExpirationTime,
consensus.nExtendedClaimExpirationTime, consensus.nExtendedClaimExpirationTime,