From f37a5e76b5213538ce800385c4e7f2d8e38c191c Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Tue, 27 May 2014 10:15:35 -0500 Subject: [PATCH] Update tests for recent API changes. --- common_test.go | 2 +- test_coverage.txt | 54 ++++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/common_test.go b/common_test.go index b98592b1..1cfed1ed 100644 --- a/common_test.go +++ b/common_test.go @@ -111,6 +111,6 @@ func chainSetup(dbName string) (*btcchain.BlockChain, func(), error) { return nil, nil, err } - chain := btcchain.New(db, btcnet.MainNetParams, nil) + chain := btcchain.New(db, &btcnet.MainNetParams, nil) return chain, teardown, nil } diff --git a/test_coverage.txt b/test_coverage.txt index b601e8de..08f15eeb 100644 --- a/test_coverage.txt +++ b/test_coverage.txt @@ -1,32 +1,28 @@ github.com/conformal/btcchain/validate.go checkSerializedHeight 100.00% (17/17) -github.com/conformal/btcchain/difficulty.go BigToCompact 100.00% (16/16) github.com/conformal/btcchain/chain.go BlockChain.removeOrphanBlock 100.00% (16/16) github.com/conformal/btcchain/txlookup.go disconnectTransactions 100.00% (13/13) github.com/conformal/btcchain/difficulty.go CompactToBig 100.00% (12/12) github.com/conformal/btcchain/validate.go CountSigOps 100.00% (9/9) +github.com/conformal/btcchain/chain.go New 100.00% (8/8) github.com/conformal/btcchain/validate.go BlockChain.CheckConnectBlock 100.00% (7/7) -github.com/conformal/btcchain/checkpoints.go init 100.00% (6/6) -github.com/conformal/btcchain/chain.go BlockChain.IsKnownOrphan 100.00% (5/5) github.com/conformal/btcchain/merkle.go HashMerkleBranches 100.00% (5/5) github.com/conformal/btcchain/difficulty.go ShaHashToBig 100.00% (5/5) +github.com/conformal/btcchain/chain.go BlockChain.IsKnownOrphan 100.00% (5/5) github.com/conformal/btcchain/difficulty.go CalcWork 100.00% (5/5) github.com/conformal/btcchain/merkle.go nextPowerOfTwo 100.00% (4/4) -github.com/conformal/btcchain/chain.go newBlockNode 100.00% (3/3) github.com/conformal/btcchain/process.go BlockChain.blockExists 100.00% (3/3) +github.com/conformal/btcchain/chain.go newBlockNode 100.00% (3/3) github.com/conformal/btcchain/checkpoints.go newShaHashFromStr 100.00% (2/2) -github.com/conformal/btcchain/chain.go New 100.00% (2/2) -github.com/conformal/btcchain/log.go DisableLog 100.00% (1/1) -github.com/conformal/btcchain/chain.go BlockChain.HaveBlock 100.00% (1/1) -github.com/conformal/btcchain/log.go init 100.00% (1/1) github.com/conformal/btcchain/timesorter.go timeSorter.Less 100.00% (1/1) -github.com/conformal/btcchain/timesorter.go timeSorter.Swap 100.00% (1/1) -github.com/conformal/btcchain/timesorter.go timeSorter.Len 100.00% (1/1) -github.com/conformal/btcchain/scriptval.go newTxValidator 100.00% (1/1) -github.com/conformal/btcchain/scriptval.go txValidator.sendResult 100.00% (1/1) +github.com/conformal/btcchain/chain.go BlockChain.HaveBlock 100.00% (1/1) github.com/conformal/btcchain/checkpoints.go BlockChain.DisableCheckpoints 100.00% (1/1) -github.com/conformal/btcchain/params.go BlockChain.chainParams 100.00% (1/1) -github.com/conformal/btcchain/validate.go CalcBlockSubsidy 100.00% (1/1) +github.com/conformal/btcchain/log.go init 100.00% (1/1) +github.com/conformal/btcchain/log.go DisableLog 100.00% (1/1) +github.com/conformal/btcchain/scriptval.go txValidator.sendResult 100.00% (1/1) +github.com/conformal/btcchain/scriptval.go newTxValidator 100.00% (1/1) +github.com/conformal/btcchain/timesorter.go timeSorter.Len 100.00% (1/1) +github.com/conformal/btcchain/timesorter.go timeSorter.Swap 100.00% (1/1) github.com/conformal/btcchain/txlookup.go fetchTxStoreMain 95.65% (22/23) github.com/conformal/btcchain/merkle.go BuildMerkleTreeStore 93.33% (14/15) github.com/conformal/btcchain/chain.go BlockChain.getReorganizeNodes 92.86% (13/14) @@ -46,52 +42,52 @@ github.com/conformal/btcchain/chain.go BlockChain.getPrevNodeFromBlock 77.78% github.com/conformal/btcchain/chain.go BlockChain.GenerateInitialIndex 77.27% (17/22) github.com/conformal/btcchain/chain.go BlockChain.disconnectBlock 76.92% (10/13) github.com/conformal/btcchain/txlookup.go BlockChain.fetchInputTransactions 75.00% (18/24) +github.com/conformal/btcchain/difficulty.go BigToCompact 75.00% (12/16) github.com/conformal/btcchain/validate.go isTransactionSpent 75.00% (3/4) github.com/conformal/btcchain/validate.go BlockChain.checkConnectBlock 71.15% (37/52) github.com/conformal/btcchain/validate.go CheckBlockSanity 67.44% (29/43) github.com/conformal/btcchain/validate.go isNullOutpoint 66.67% (2/3) +github.com/conformal/btcchain/validate.go CalcBlockSubsidy 66.67% (2/3) github.com/conformal/btcchain/validate.go CheckTransactionInputs 65.12% (28/43) github.com/conformal/btcchain/txlookup.go connectTransactions 61.54% (8/13) github.com/conformal/btcchain/validate.go CheckTransactionSanity 61.11% (22/36) -github.com/conformal/btcchain/params.go ChainParams 60.00% (3/5) github.com/conformal/btcchain/validate.go isBIP0030Node 60.00% (3/5) github.com/conformal/btcchain/scriptval.go txValidator.validateHandler 59.26% (16/27) -github.com/conformal/btcchain/chain.go BlockChain.loadBlockNode 53.85% (14/26) +github.com/conformal/btcchain/accept.go BlockChain.maybeAcceptBlock 54.41% (37/68) github.com/conformal/btcchain/validate.go CheckProofOfWork 53.33% (8/15) github.com/conformal/btcchain/process.go BlockChain.ProcessBlock 52.27% (23/44) -github.com/conformal/btcchain/accept.go BlockChain.maybeAcceptBlock 51.28% (40/78) +github.com/conformal/btcchain/chain.go BlockChain.loadBlockNode 52.00% (13/25) github.com/conformal/btcchain/chain.go BlockChain.getPrevNodeFromNode 50.00% (4/8) -github.com/conformal/btcchain/checkpoints.go BlockChain.LatestCheckpoint 50.00% (2/4) github.com/conformal/btcchain/notifications.go BlockChain.sendNotification 50.00% (2/4) +github.com/conformal/btcchain/checkpoints.go BlockChain.LatestCheckpoint 50.00% (2/4) github.com/conformal/btcchain/chain.go BlockChain.pruneBlockNodes 41.18% (7/17) github.com/conformal/btcchain/validate.go IsFinalizedTransaction 28.57% (4/14) github.com/conformal/btcchain/checkpoints.go BlockChain.verifyCheckpoint 22.22% (2/9) -github.com/conformal/btcchain/difficulty.go BlockChain.calcNextRequiredDifficulty 17.07% (7/41) +github.com/conformal/btcchain/difficulty.go BlockChain.calcNextRequiredDifficulty 11.11% (4/36) github.com/conformal/btcchain/checkpoints.go BlockChain.findPreviousCheckpoint 4.88% (2/41) github.com/conformal/btcchain/blocklocator.go BlockChain.BlockLocatorFromHash 0.00% (0/39) github.com/conformal/btcchain/checkpoints.go BlockChain.IsCheckpointCandidate 0.00% (0/32) github.com/conformal/btcchain/validate.go CountP2SHSigOps 0.00% (0/26) -github.com/conformal/btcchain/difficulty.go BlockChain.calcEasiestDifficulty 0.00% (0/15) github.com/conformal/btcchain/chain.go BlockChain.removeBlockNode 0.00% (0/12) -github.com/conformal/btcchain/difficulty.go BlockChain.findPrevTestNetDifficulty 0.00% (0/12) +github.com/conformal/btcchain/difficulty.go BlockChain.calcEasiestDifficulty 0.00% (0/12) +github.com/conformal/btcchain/difficulty.go BlockChain.findPrevTestNetDifficulty 0.00% (0/11) github.com/conformal/btcchain/chain.go BlockChain.GetOrphanRoot 0.00% (0/11) github.com/conformal/btcchain/scriptval.go ValidateTransactionScripts 0.00% (0/11) github.com/conformal/btcchain/log.go SetLogWriter 0.00% (0/10) github.com/conformal/btcchain/chain.go BlockChain.IsCurrent 0.00% (0/9) github.com/conformal/btcchain/chain.go removeChildNode 0.00% (0/8) -github.com/conformal/btcchain/txlookup.go BlockChain.FetchTransactionStore 0.00% (0/6) github.com/conformal/btcchain/blocklocator.go BlockChain.LatestBlockLocator 0.00% (0/6) +github.com/conformal/btcchain/txlookup.go BlockChain.FetchTransactionStore 0.00% (0/6) github.com/conformal/btcchain/checkpoints.go isNonstandardTransaction 0.00% (0/5) -github.com/conformal/btcchain/checkpoints.go BlockChain.checkpointData 0.00% (0/4) +github.com/conformal/btcchain/notifications.go NotificationType.String 0.00% (0/3) github.com/conformal/btcchain/chain.go addChildrenWork 0.00% (0/3) github.com/conformal/btcchain/checkpoints.go BlockChain.Checkpoints 0.00% (0/3) -github.com/conformal/btcchain/notifications.go NotificationType.String 0.00% (0/3) +github.com/conformal/btcchain/chain.go BlockChain.CalcPastMedianTime 0.00% (0/1) +github.com/conformal/btcchain/log.go newLogClosure 0.00% (0/1) +github.com/conformal/btcchain/difficulty.go BlockChain.CalcNextRequiredDifficulty 0.00% (0/1) github.com/conformal/btcchain/process.go RuleError.Error 0.00% (0/1) +github.com/conformal/btcchain/log.go UseLogger 0.00% (0/1) github.com/conformal/btcchain/log.go logClosure.String 0.00% (0/1) github.com/conformal/btcchain/chain.go BlockChain.DisableVerify 0.00% (0/1) -github.com/conformal/btcchain/log.go newLogClosure 0.00% (0/1) -github.com/conformal/btcchain/log.go UseLogger 0.00% (0/1) -github.com/conformal/btcchain/chain.go BlockChain.CalcPastMedianTime 0.00% (0/1) -github.com/conformal/btcchain/difficulty.go BlockChain.CalcNextRequiredDifficulty 0.00% (0/1) -github.com/conformal/btcchain ------------------------------------- 56.50% (704/1246) +github.com/conformal/btcchain ------------------------------------- 56.65% (690/1218)