From 693b6731e21201fa0b88c513998fa82962ce6d6b Mon Sep 17 00:00:00 2001 From: Tsachi Herman Date: Wed, 30 Dec 2020 12:50:27 -0500 Subject: [PATCH] Run gofmt against source code (#1797) Run gofmt against source code, and update coding style. --- agreement/bundle_test.go | 2 +- agreement/demux_test.go | 44 +++++++++---------- agreement/fuzzer/tests_test.go | 2 +- agreement/vote_test.go | 2 +- crypto/merkletrie/node.go | 10 ++--- .../api/server/v1/handlers/handlers_test.go | 10 ++--- data/basics/userBalance_test.go | 2 +- data/bookkeeping/encoding_test.go | 2 +- data/ledger.go | 4 +- data/pools/transactionPool_test.go | 2 +- data/transactions/logic/evalStateful_test.go | 4 +- data/txHandler.go | 2 +- ledger/eval.go | 2 +- ledger/eval_test.go | 18 ++++---- ledger/ledger_perf_test.go | 8 ++-- ledger/totals_test.go | 16 +++---- network/multiplexer_test.go | 8 ++-- network/netprio.go | 2 +- network/ping.go | 4 +- network/wsNetwork_test.go | 32 +++++++------- test/netperf-go/puppeteer/puppeteer_test.go | 6 +-- util/metrics/reporter_test.go | 26 +++++------ 22 files changed, 104 insertions(+), 104 deletions(-) diff --git a/agreement/bundle_test.go b/agreement/bundle_test.go index 9b557d5b2c..6dd742f6bd 100644 --- a/agreement/bundle_test.go +++ b/agreement/bundle_test.go @@ -258,7 +258,7 @@ func TestBundleCreationWithEquivocationVotes(t *testing.T) { require.Error(t, err) evBadEVBundle := unauthenticatedBundles[4] - evBadEVBundle.EquivocationVotes[0].Sigs = [2]crypto.OneTimeSignature{crypto.OneTimeSignature{}, crypto.OneTimeSignature{}} + evBadEVBundle.EquivocationVotes[0].Sigs = [2]crypto.OneTimeSignature{{}, {}} _, err = evBadEVBundle.verify(context.Background(), ledger, avv) require.Error(t, err) diff --git a/agreement/demux_test.go b/agreement/demux_test.go index 8b5634d098..42bbecbc5d 100644 --- a/agreement/demux_test.go +++ b/agreement/demux_test.go @@ -69,8 +69,8 @@ type demuxTestUsecase struct { } var demuxTestUsecases = []demuxTestUsecase{ - demuxTestUsecase{ - queue: []testChanState{testChanState{eventCount: 1, closed: false}}, + { + queue: []testChanState{{eventCount: 1, closed: false}}, rawVotes: testChanState{eventCount: 1, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, rawBundles: testChanState{eventCount: 0, closed: false}, @@ -87,8 +87,8 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{Err: makeSerErrStr("QueueEvent-0-0")}, ok: true, }, - demuxTestUsecase{ - queue: []testChanState{testChanState{eventCount: 0, closed: true}, testChanState{eventCount: 1, closed: true}}, + { + queue: []testChanState{{eventCount: 0, closed: true}, {eventCount: 1, closed: true}}, rawVotes: testChanState{eventCount: 1, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, rawBundles: testChanState{eventCount: 0, closed: false}, @@ -105,8 +105,8 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{Err: makeSerErrStr("QueueEvent-1-0")}, ok: true, }, - demuxTestUsecase{ - queue: []testChanState{testChanState{eventCount: 0, closed: false}}, + { + queue: []testChanState{{eventCount: 0, closed: false}}, rawVotes: testChanState{eventCount: 1, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, rawBundles: testChanState{eventCount: 0, closed: false}, @@ -123,7 +123,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: emptyEvent{}, ok: false, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 1, closed: false}, @@ -141,7 +141,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{T: payloadPresent}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, @@ -159,7 +159,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{T: bundlePresent}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 1, closed: false}, rawProposals: testChanState{eventCount: 1, closed: false}, @@ -177,7 +177,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{T: bundlePresent}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 1, closed: false}, rawProposals: testChanState{eventCount: 1, closed: false}, @@ -195,7 +195,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{T: votePresent}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 1, closed: false}, @@ -213,7 +213,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{T: bundlePresent}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, @@ -231,7 +231,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: roundInterruptionEvent{}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 1, closed: false}, rawProposals: testChanState{eventCount: 1, closed: false}, @@ -249,7 +249,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: emptyEvent{}, ok: false, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 1, closed: false}, rawProposals: testChanState{eventCount: 1, closed: false}, @@ -267,7 +267,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: roundInterruptionEvent{}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 1, closed: false}, rawProposals: testChanState{eventCount: 1, closed: false}, @@ -285,7 +285,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: timeoutEvent{T: timeout}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, @@ -303,7 +303,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{T: voteVerified, Err: makeSerErrStr("Verified-AV-{test_index}-0")}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, @@ -321,7 +321,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{T: payloadVerified, Err: makeSerErrStr("Verified-PP-{test_index}-0")}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, @@ -339,7 +339,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: messageEvent{T: bundleVerified, Err: makeSerErrStr("Verified-VB-{test_index}-0")}, ok: true, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: true}, rawProposals: testChanState{eventCount: 0, closed: false}, @@ -357,7 +357,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: emptyEvent{}, ok: false, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 0, closed: true}, @@ -375,7 +375,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: emptyEvent{}, ok: false, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 0, closed: false}, @@ -393,7 +393,7 @@ var demuxTestUsecases = []demuxTestUsecase{ e: emptyEvent{}, ok: false, }, - demuxTestUsecase{ + { queue: []testChanState{}, rawVotes: testChanState{eventCount: 0, closed: false}, rawProposals: testChanState{eventCount: 1, closed: false}, diff --git a/agreement/fuzzer/tests_test.go b/agreement/fuzzer/tests_test.go index 89c1217236..d7008fc95d 100644 --- a/agreement/fuzzer/tests_test.go +++ b/agreement/fuzzer/tests_test.go @@ -838,7 +838,7 @@ func TestRegossipinngElimination(t *testing.T) { &MessageRegossipFilter{}, }, Schedule: []SchedulerFilterSchedule{ - SchedulerFilterSchedule{ + { Operation: 4, // not before FirstTick: 0, // zero Nodes: nodesIndices, diff --git a/agreement/vote_test.go b/agreement/vote_test.go index e49f3d16a4..6a7c354de3 100644 --- a/agreement/vote_test.go +++ b/agreement/vote_test.go @@ -313,7 +313,7 @@ func TestEquivocationVoteValidation(t *testing.T) { _, err = v1.Cred.Verify(config.Consensus[protocol.ConsensusCurrentVersion], m) noSig := ev - noSig.Sigs = [2]crypto.OneTimeSignature{crypto.OneTimeSignature{}, crypto.OneTimeSignature{}} + noSig.Sigs = [2]crypto.OneTimeSignature{{}, {}} _, err = noSig.verify(ledger) require.Error(t, err) diff --git a/crypto/merkletrie/node.go b/crypto/merkletrie/node.go index 81e99ee3e9..dcf8357970 100644 --- a/crypto/merkletrie/node.go +++ b/crypto/merkletrie/node.go @@ -117,22 +117,22 @@ func (n *node) add(cache *merkleTrieCache, d []byte, path []byte) (nodeID stored if n.hash[idiff] < d[idiff] { pnode.children = []childEntry{ - childEntry{ + { id: curChildNodeID, hashIndex: n.hash[idiff], }, - childEntry{ + { id: newChildNodeID, hashIndex: d[idiff], }, } } else { pnode.children = []childEntry{ - childEntry{ + { id: newChildNodeID, hashIndex: d[idiff], }, - childEntry{ + { id: curChildNodeID, hashIndex: n.hash[idiff], }, @@ -145,7 +145,7 @@ func (n *node) add(cache *merkleTrieCache, d []byte, path []byte) (nodeID stored pnode2, nodeID2 := cache.allocateNewNode() pnode2.childrenMask.SetBit(d[i]) pnode2.children = []childEntry{ - childEntry{ + { id: nodeID, hashIndex: d[i], }, diff --git a/daemon/algod/api/server/v1/handlers/handlers_test.go b/daemon/algod/api/server/v1/handlers/handlers_test.go index b904f97353..c6ee766495 100644 --- a/daemon/algod/api/server/v1/handlers/handlers_test.go +++ b/daemon/algod/api/server/v1/handlers/handlers_test.go @@ -41,26 +41,26 @@ func TestDecorateUnknownTransactionTypeError(t *testing.T) { signedKeyregTx := transactions.SignedTxn{Txn: keyregTx} testCases := []TestCase{ - TestCase{ + { err: errors.New(errBlockHashBeenDeletedArchival), expectedOutcome: errors.New(errBlockHashBeenDeletedArchival), }, - TestCase{ + { err: errors.New(errUnknownTransactionType), txn: node.TxnWithStatus{Txn: signedPaymentTx, ConfirmedRound: basics.Round(12345)}, expectedOutcome: fmt.Errorf(errInvalidTransactionTypeLedger, paymentTx.Type, paymentTx.ID().String(), basics.Round(12345)), }, - TestCase{ + { err: errors.New(errUnknownTransactionType), txn: node.TxnWithStatus{Txn: signedKeyregTx, ConfirmedRound: basics.Round(5678)}, expectedOutcome: fmt.Errorf(errInvalidTransactionTypeLedger, keyregTx.Type, keyregTx.ID().String(), basics.Round(5678)), }, - TestCase{ + { err: errors.New(errUnknownTransactionType), txn: node.TxnWithStatus{Txn: signedPaymentTx}, expectedOutcome: fmt.Errorf(errInvalidTransactionTypePending, paymentTx.Type, paymentTx.ID().String()), }, - TestCase{ + { err: errors.New(errUnknownTransactionType), txn: node.TxnWithStatus{Txn: signedKeyregTx}, expectedOutcome: fmt.Errorf(errInvalidTransactionTypePending, keyregTx.Type, keyregTx.ID().String()), diff --git a/data/basics/userBalance_test.go b/data/basics/userBalance_test.go index bc23ac8890..a56521f939 100644 --- a/data/basics/userBalance_test.go +++ b/data/basics/userBalance_test.go @@ -35,7 +35,7 @@ func TestEmptyEncoding(t *testing.T) { func TestRewards(t *testing.T) { proto := config.Consensus[protocol.ConsensusCurrentVersion] - accountAlgos := []MicroAlgos{MicroAlgos{Raw: 0}, MicroAlgos{Raw: 8000}, MicroAlgos{Raw: 13000}, MicroAlgos{Raw: 83000}} + accountAlgos := []MicroAlgos{{Raw: 0}, {Raw: 8000}, {Raw: 13000}, {Raw: 83000}} for _, accountAlgo := range accountAlgos { ad := AccountData{ Status: Online, diff --git a/data/bookkeeping/encoding_test.go b/data/bookkeeping/encoding_test.go index 43149a8dd8..09839da68b 100644 --- a/data/bookkeeping/encoding_test.go +++ b/data/bookkeeping/encoding_test.go @@ -48,7 +48,7 @@ func TestBlockWithTxnEncoding(t *testing.T) { var b Block b.Payset = []transactions.SignedTxnInBlock{ - transactions.SignedTxnInBlock{ + { SignedTxnWithAD: transactions.SignedTxnWithAD{ SignedTxn: sigtxn, }, diff --git a/data/ledger.go b/data/ledger.go index 3d7ec8903a..840f1ae375 100644 --- a/data/ledger.go +++ b/data/ledger.go @@ -237,7 +237,7 @@ func (l *Ledger) Circulation(r basics.Round) (basics.MicroAlgos, error) { roundCirculation{ elements: [2]roundCirculationPair{ circulation.elements[1], - roundCirculationPair{ + { round: r, onlineMoney: totals.Online.Money}, }, @@ -271,7 +271,7 @@ func (l *Ledger) Seed(r basics.Round) (committee.Seed, error) { roundSeed{ elements: [2]roundSeedPair{ seed.elements[1], - roundSeedPair{ + { round: r, seed: blockhdr.Seed, }, diff --git a/data/pools/transactionPool_test.go b/data/pools/transactionPool_test.go index dd01638b85..d2ae66b4b6 100644 --- a/data/pools/transactionPool_test.go +++ b/data/pools/transactionPool_test.go @@ -823,7 +823,7 @@ func TestRemove(t *testing.T) { } signedTx := tx.Sign(secrets[0]) require.NoError(t, transactionPool.RememberOne(signedTx)) - require.Equal(t, transactionPool.PendingTxGroups(), [][]transactions.SignedTxn{[]transactions.SignedTxn{signedTx}}) + require.Equal(t, transactionPool.PendingTxGroups(), [][]transactions.SignedTxn{{signedTx}}) } func TestLogicSigOK(t *testing.T) { diff --git a/data/transactions/logic/evalStateful_test.go b/data/transactions/logic/evalStateful_test.go index f7fbe8a235..08e8d92ebb 100644 --- a/data/transactions/logic/evalStateful_test.go +++ b/data/transactions/logic/evalStateful_test.go @@ -1019,8 +1019,8 @@ func TestAssets(t *testing.T) { } // check generic errors sources := []sourceError{ - sourceError{"int 5\nint 55\nasset_holding_get AssetBalance", "cannot load account[5]"}, - sourceError{"int 5\nasset_params_get AssetTotal", "invalid ForeignAssets index 5"}, + {"int 5\nint 55\nasset_holding_get AssetBalance", "cannot load account[5]"}, + {"int 5\nasset_params_get AssetTotal", "invalid ForeignAssets index 5"}, } for _, sourceErr := range sources { ops, err := AssembleStringWithVersion(sourceErr.src, AssemblerMaxVersion) diff --git a/data/txHandler.go b/data/txHandler.go index b8ded970a9..a59e5eb725 100644 --- a/data/txHandler.go +++ b/data/txHandler.go @@ -97,7 +97,7 @@ func MakeTxHandler(txPool *pools.TransactionPool, ledger *Ledger, net network.Go // Start enables the processing of incoming messages at the transaction handler func (handler *TxHandler) Start() { handler.net.RegisterHandlers([]network.TaggedMessageHandler{ - network.TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: network.HandlerFunc(handler.processIncomingTxn)}, + {Tag: protocol.TxnTag, MessageHandler: network.HandlerFunc(handler.processIncomingTxn)}, }) handler.backlogWg.Add(1) go handler.backlogWorker() diff --git a/ledger/eval.go b/ledger/eval.go index 43e27f1203..28fde8fd9f 100644 --- a/ledger/eval.go +++ b/ledger/eval.go @@ -488,7 +488,7 @@ func (eval *BlockEvaluator) testTransaction(txn transactions.SignedTxn, cow *rou // an error is returned and the block evaluator state is unchanged. func (eval *BlockEvaluator) Transaction(txn transactions.SignedTxn, ad transactions.ApplyData) error { return eval.transactionGroup([]transactions.SignedTxnWithAD{ - transactions.SignedTxnWithAD{ + { SignedTxn: txn, ApplyData: ad, }, diff --git a/ledger/eval_test.go b/ledger/eval_test.go index 67399b590f..37da2ff9ee 100644 --- a/ledger/eval_test.go +++ b/ledger/eval_test.go @@ -282,15 +282,15 @@ func TestPrepareAppEvaluators(t *testing.T) { // Create some groups with these transactions cases := []evalTestCase{ - evalTestCase{[]transactions.SignedTxnWithAD{payment}, []bool{false}}, - evalTestCase{[]transactions.SignedTxnWithAD{appcall1}, []bool{true}}, - evalTestCase{[]transactions.SignedTxnWithAD{payment, payment}, []bool{false, false}}, - evalTestCase{[]transactions.SignedTxnWithAD{appcall1, payment}, []bool{true, false}}, - evalTestCase{[]transactions.SignedTxnWithAD{payment, appcall1}, []bool{false, true}}, - evalTestCase{[]transactions.SignedTxnWithAD{appcall1, appcall2}, []bool{true, true}}, - evalTestCase{[]transactions.SignedTxnWithAD{appcall1, appcall2, appcall1}, []bool{true, true, true}}, - evalTestCase{[]transactions.SignedTxnWithAD{payment, appcall1, payment}, []bool{false, true, false}}, - evalTestCase{[]transactions.SignedTxnWithAD{appcall1, payment, appcall2}, []bool{true, false, true}}, + {[]transactions.SignedTxnWithAD{payment}, []bool{false}}, + {[]transactions.SignedTxnWithAD{appcall1}, []bool{true}}, + {[]transactions.SignedTxnWithAD{payment, payment}, []bool{false, false}}, + {[]transactions.SignedTxnWithAD{appcall1, payment}, []bool{true, false}}, + {[]transactions.SignedTxnWithAD{payment, appcall1}, []bool{false, true}}, + {[]transactions.SignedTxnWithAD{appcall1, appcall2}, []bool{true, true}}, + {[]transactions.SignedTxnWithAD{appcall1, appcall2, appcall1}, []bool{true, true, true}}, + {[]transactions.SignedTxnWithAD{payment, appcall1, payment}, []bool{false, true, false}}, + {[]transactions.SignedTxnWithAD{appcall1, payment, appcall2}, []bool{true, false, true}}, } for i, testCase := range cases { diff --git a/ledger/ledger_perf_test.go b/ledger/ledger_perf_test.go index 9c4d88f375..2a6c264129 100644 --- a/ledger/ledger_perf_test.go +++ b/ledger/ledger_perf_test.go @@ -95,8 +95,8 @@ func makeUnsignedASATx(appIdx uint64, creator basics.Address, round int) transac creator[:], creator[:], creator[:], - []byte{0, 0, 0, 1, 0, 0, 0, 0}, - []byte{0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 1, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0, 0}, } tx.OnCompletion = transactions.NoOpOC tx.ApprovalProgram = asaAppovalProgram @@ -226,11 +226,11 @@ func benchmarkFullBlocks(params testParams, b *testing.B) { if createdAppIdx != 0 { // Creator spends to an opted in acct tx.ApplicationArgs = [][]byte{ - []byte{0, 0, 0, 0, 0, 0, 0, 1}, + {0, 0, 0, 0, 0, 0, 0, 1}, } tx.Accounts = []basics.Address{ accts[j%len(accts)], - basics.Address{}, + {}, } } default: diff --git a/ledger/totals_test.go b/ledger/totals_test.go index 9239d2f095..58707bfc75 100644 --- a/ledger/totals_test.go +++ b/ledger/totals_test.go @@ -78,7 +78,7 @@ func TestAlgoCountMarshalMsg(t *testing.T) { } var uniqueAccountTotals = []AccountTotals{ - AccountTotals{ + { Online: AlgoCount{ Money: basics.MicroAlgos{Raw: 0x1234123412340000}, RewardUnits: 0x1234123412340000, @@ -93,7 +93,7 @@ var uniqueAccountTotals = []AccountTotals{ }, RewardsLevel: 0x1234123412340000, }, - AccountTotals{ + { Online: AlgoCount{ Money: basics.MicroAlgos{Raw: 0x1234123412340001}, RewardUnits: 0x1234123412340000, @@ -108,7 +108,7 @@ var uniqueAccountTotals = []AccountTotals{ }, RewardsLevel: 0x1234123412340000, }, - AccountTotals{ + { Online: AlgoCount{ Money: basics.MicroAlgos{Raw: 0x1234123412340000}, RewardUnits: 0x1234123412340001, @@ -123,7 +123,7 @@ var uniqueAccountTotals = []AccountTotals{ }, RewardsLevel: 0x1234123412340000, }, - AccountTotals{ + { Online: AlgoCount{ Money: basics.MicroAlgos{Raw: 0x1234123412340000}, RewardUnits: 0x1234123412340000, @@ -138,7 +138,7 @@ var uniqueAccountTotals = []AccountTotals{ }, RewardsLevel: 0x1234123412340000, }, - AccountTotals{ + { Online: AlgoCount{ Money: basics.MicroAlgos{Raw: 0x1234123412340000}, RewardUnits: 0x1234123412340000, @@ -153,7 +153,7 @@ var uniqueAccountTotals = []AccountTotals{ }, RewardsLevel: 0x1234123412340000, }, - AccountTotals{ + { Online: AlgoCount{ Money: basics.MicroAlgos{Raw: 0x1234123412340000}, RewardUnits: 0x1234123412340000, @@ -168,7 +168,7 @@ var uniqueAccountTotals = []AccountTotals{ }, RewardsLevel: 0x1234123412340000, }, - AccountTotals{ + { Online: AlgoCount{ Money: basics.MicroAlgos{Raw: 0x1234123412340000}, RewardUnits: 0x1234123412340000, @@ -183,7 +183,7 @@ var uniqueAccountTotals = []AccountTotals{ }, RewardsLevel: 0x1234123412340000, }, - AccountTotals{ + { Online: AlgoCount{ Money: basics.MicroAlgos{Raw: 0x1234123412340000}, RewardUnits: 0x1234123412340000, diff --git a/network/multiplexer_test.go b/network/multiplexer_test.go index 3c12f11ca3..2fbd4e16e3 100644 --- a/network/multiplexer_test.go +++ b/network/multiplexer_test.go @@ -65,7 +65,7 @@ func TestMultiplexer(t *testing.T) { } // Registering our handler should succeed - m.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{protocol.TxnTag, handler}}) + m.RegisterHandlers([]TaggedMessageHandler{{protocol.TxnTag, handler}}) // Can't register two handlers for the same typetag panicked := false @@ -76,7 +76,7 @@ func TestMultiplexer(t *testing.T) { } }() m := MakeMultiplexer(logging.TestingLog(t)) - m.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{protocol.TxnTag, handler}, TaggedMessageHandler{protocol.TxnTag, handler}}) + m.RegisterHandlers([]TaggedMessageHandler{{protocol.TxnTag, handler}, {protocol.TxnTag, handler}}) }() require.True(t, panicked) @@ -88,8 +88,8 @@ func TestMultiplexer(t *testing.T) { } }() m := MakeMultiplexer(logging.TestingLog(t)) - m.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{protocol.TxnTag, handler}}) - m.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{protocol.TxnTag, handler}}) + m.RegisterHandlers([]TaggedMessageHandler{{protocol.TxnTag, handler}}) + m.RegisterHandlers([]TaggedMessageHandler{{protocol.TxnTag, handler}}) }() require.True(t, panicked) diff --git a/network/netprio.go b/network/netprio.go index 37295f589f..f627fa86cd 100644 --- a/network/netprio.go +++ b/network/netprio.go @@ -64,7 +64,7 @@ func prioResponseHandler(message IncomingMessage) OutgoingMessage { } var prioHandlers = []TaggedMessageHandler{ - TaggedMessageHandler{protocol.NetPrioResponseTag, HandlerFunc(prioResponseHandler)}, + {protocol.NetPrioResponseTag, HandlerFunc(prioResponseHandler)}, } // The prioTracker sorts active peers by priority, and ensures diff --git a/network/ping.go b/network/ping.go index 5450335ac0..378b3f1f8e 100644 --- a/network/ping.go +++ b/network/ping.go @@ -64,6 +64,6 @@ func pingReplyHandler(message IncomingMessage) OutgoingMessage { } var pingHandlers = []TaggedMessageHandler{ - TaggedMessageHandler{protocol.PingTag, HandlerFunc(pingHandler)}, - TaggedMessageHandler{protocol.PingReplyTag, HandlerFunc(pingReplyHandler)}, + {protocol.PingTag, HandlerFunc(pingHandler)}, + {protocol.PingReplyTag, HandlerFunc(pingReplyHandler)}, } diff --git a/network/wsNetwork_test.go b/network/wsNetwork_test.go index 0c83006f99..f68cd03ad3 100644 --- a/network/wsNetwork_test.go +++ b/network/wsNetwork_test.go @@ -232,7 +232,7 @@ func TestWebsocketNetworkBasic(t *testing.T) { defer func() { t.Log("stopping B"); netB.Stop(); t.Log("B done") }() counter := newMessageCounter(t, 2) counterDone := counter.done - netB.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: counter}}) + netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counter}}) readyTimeout := time.NewTimer(2 * time.Second) waitReady(t, netA, readyTimeout.C) @@ -266,7 +266,7 @@ func TestWebsocketNetworkUnicast(t *testing.T) { defer func() { t.Log("stopping B"); netB.Stop(); t.Log("B done") }() counter := newMessageCounter(t, 2) counterDone := counter.done - netB.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: counter}}) + netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counter}}) readyTimeout := time.NewTimer(2 * time.Second) waitReady(t, netA, readyTimeout.C) @@ -308,7 +308,7 @@ func TestWebsocketNetworkNoAddress(t *testing.T) { defer func() { t.Log("stopping B"); netB.Stop(); t.Log("B done") }() counter := newMessageCounter(t, 2) counterDone := counter.done - netB.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: counter}}) + netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counter}}) readyTimeout := time.NewTimer(2 * time.Second) waitReady(t, netA, readyTimeout.C) @@ -340,7 +340,7 @@ func lineNetwork(t *testing.T, numNodes int) (nodes []*WebsocketNetwork, counter addrPrev, postListen := nodes[i-1].Address() require.True(t, postListen) nodes[i].phonebook.ReplacePeerList([]string{addrPrev}, "default") - nodes[i].RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: &counters[i]}}) + nodes[i].RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: &counters[i]}}) } nodes[i].Start() counters[i].t = t @@ -711,10 +711,10 @@ func TestDupFilter(t *testing.T) { netB.Start() defer func() { t.Log("stopping B"); netB.Stop(); t.Log("B done") }() counter := &messageCounterHandler{t: t, limit: 1, done: make(chan struct{})} - netB.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.AgreementVoteTag, MessageHandler: counter}}) + netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.AgreementVoteTag, MessageHandler: counter}}) debugTag2 := protocol.ProposalPayloadTag counter2 := &messageCounterHandler{t: t, limit: 1, done: make(chan struct{})} - netB.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: debugTag2, MessageHandler: counter2}}) + netB.RegisterHandlers([]TaggedMessageHandler{{Tag: debugTag2, MessageHandler: counter2}}) addrB, postListen := netB.Address() require.True(t, postListen) @@ -856,7 +856,7 @@ func BenchmarkWebsocketNetworkBasic(t *testing.B) { defer func() { t.Log("stopping B"); netB.Stop(); t.Log("B done") }() returns := make(chan uint64, 100) bhandler := benchmarkHandler{returns} - netB.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: &bhandler}}) + netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: &bhandler}}) readyTimeout := time.NewTimer(2 * time.Second) waitReady(t, netA, readyTimeout.C) @@ -976,7 +976,7 @@ func TestWebsocketNetworkPrioLimit(t *testing.T) { netB.SetPrioScheme(&prioB) netB.config.GossipFanout = 1 netB.phonebook.ReplacePeerList([]string{addrA}, "default") - netB.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: counterB}}) + netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counterB}}) netB.Start() defer func() { t.Log("stopping B"); netB.Stop(); t.Log("B done") }() @@ -989,7 +989,7 @@ func TestWebsocketNetworkPrioLimit(t *testing.T) { netC.SetPrioScheme(&prioC) netC.config.GossipFanout = 1 netC.phonebook.ReplacePeerList([]string{addrA}, "default") - netC.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: counterC}}) + netC.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counterC}}) netC.Start() defer func() { t.Log("stopping C"); netC.Stop(); t.Log("C done") }() @@ -1176,7 +1176,7 @@ func TestDelayedMessageDrop(t *testing.T) { defer func() { t.Log("stopping B"); netB.Stop(); t.Log("B done") }() counter := newMessageCounter(t, 5) counterDone := counter.done - netB.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: counter}}) + netB.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counter}}) readyTimeout := time.NewTimer(2 * time.Second) waitReady(t, netA, readyTimeout.C) @@ -1275,7 +1275,7 @@ func TestForceMessageRelaying(t *testing.T) { counter := newMessageCounter(t, 5) counterDone := counter.done - netA.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: counter}}) + netA.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counter}}) netA.Start() addrA, postListen := netA.Address() require.Truef(t, postListen, "Listening network failed to start") @@ -1320,7 +1320,7 @@ func TestForceMessageRelaying(t *testing.T) { netA.ClearHandlers() counter = newMessageCounter(t, 10) counterDone = counter.done - netA.RegisterHandlers([]TaggedMessageHandler{TaggedMessageHandler{Tag: protocol.TxnTag, MessageHandler: counter}}) + netA.RegisterHandlers([]TaggedMessageHandler{{Tag: protocol.TxnTag, MessageHandler: counter}}) // hack the relayMessages on the netB so that it would start sending messages. netB.relayMessages = true @@ -1440,7 +1440,7 @@ func TestWebsocketNetworkTopicRoundtrip(t *testing.T) { defer func() { t.Log("stopping B"); netB.Stop(); t.Log("B done") }() netB.RegisterHandlers([]TaggedMessageHandler{ - TaggedMessageHandler{ + { Tag: topicMsgReqTag, MessageHandler: HandlerFunc(handleTopicRequest), }, @@ -1522,7 +1522,7 @@ func TestWebsocketNetworkMessageOfInterest(t *testing.T) { } netB.RegisterHandlers(taggedHandlers) netA.RegisterHandlers([]TaggedMessageHandler{ - TaggedMessageHandler{ + { Tag: protocol.AgreementVoteTag, MessageHandler: HandlerFunc(waitMessageArriveHandler), }}) @@ -1604,7 +1604,7 @@ func TestWebsocketDisconnection(t *testing.T) { // register all the handlers. taggedHandlersA := []TaggedMessageHandler{ - TaggedMessageHandler{ + { Tag: protocol.ProposalPayloadTag, MessageHandler: HandlerFunc(msgHandlerA), }, @@ -1613,7 +1613,7 @@ func TestWebsocketDisconnection(t *testing.T) { netA.RegisterHandlers(taggedHandlersA) taggedHandlersB := []TaggedMessageHandler{ - TaggedMessageHandler{ + { Tag: protocol.ProposalPayloadTag, MessageHandler: HandlerFunc(msgHandlerB), }, diff --git a/test/netperf-go/puppeteer/puppeteer_test.go b/test/netperf-go/puppeteer/puppeteer_test.go index d97ca2855a..0c250ec499 100644 --- a/test/netperf-go/puppeteer/puppeteer_test.go +++ b/test/netperf-go/puppeteer/puppeteer_test.go @@ -24,21 +24,21 @@ func TestMetricsPrintout(t *testing.T) { // this test function was meant for local development test and not as an official unit test. t.Skip() puppets := []*puppet{ - &puppet{ + { recipeName: "recipename1.json", metrics: map[string]float64{ "message_count": 10.0, "sent_bytes": 30000, }, }, - &puppet{ + { recipeName: "recipename2_or_maybe_something_else.json", metrics: map[string]float64{ "message_count": 13.0, "received_bytes": 200000, }, }, - &puppet{ + { recipeName: "recipename3.json", metrics: map[string]float64{ "message_count": 50.0, diff --git a/util/metrics/reporter_test.go b/util/metrics/reporter_test.go index 5928d0a44a..95f0f8fd2f 100755 --- a/util/metrics/reporter_test.go +++ b/util/metrics/reporter_test.go @@ -24,15 +24,15 @@ import ( func TestParseNodeExporterArgs(t *testing.T) { passTestcases := map[string][]string{ - "./node_exporter": []string{"./node_exporter", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // simple case - "./node_exporter --collector.systemd": []string{"./node_exporter", "--collector.systemd", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // extended case with one argument - "./node_exporter random --collector.systemd": []string{"./node_exporter", "random", "--collector.systemd", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // extended case multiple arguments - "/usr/bin/local/node_exporter --collector.systemd random": []string{"/usr/bin/local/node_exporter", "--collector.systemd", "random", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // other executable path - " /usr/bin/local/node_exporter --collector.systemd random": []string{"/usr/bin/local/node_exporter", "--collector.systemd", "random", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // space at beginning of option - "./node_exporter --web.telemetry-path=/foobar --web.listen-address=:9090 ": []string{"./node_exporter", "--web.listen-address=:9090", "--web.telemetry-path=/foobar"}, // overriding defaults - "./node_exporter --web.listen-address=:8080 --web.telemetry-path=/barfoo": []string{"./node_exporter", "--web.listen-address=:8080", "--web.telemetry-path=/barfoo"}, // overriding defaults different order and multiple spaces - "./node_exporter --web.listen-address=:9090 --collector.proc --web.telemetry-path=/foobar": []string{"./node_exporter", "--collector.proc", "--web.listen-address=:9090", "--web.telemetry-path=/foobar"}, // argument in between the persistent ones - "./node_exporter --web.listen-address=:9090 --collector.test --collector.systemd ": []string{"./node_exporter", "--collector.test", "--collector.systemd", "--web.listen-address=:9090", "--web.telemetry-path=/metrics"}, // argument after persistent one + "./node_exporter": {"./node_exporter", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // simple case + "./node_exporter --collector.systemd": {"./node_exporter", "--collector.systemd", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // extended case with one argument + "./node_exporter random --collector.systemd": {"./node_exporter", "random", "--collector.systemd", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // extended case multiple arguments + "/usr/bin/local/node_exporter --collector.systemd random": {"/usr/bin/local/node_exporter", "--collector.systemd", "random", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // other executable path + " /usr/bin/local/node_exporter --collector.systemd random": {"/usr/bin/local/node_exporter", "--collector.systemd", "random", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // space at beginning of option + "./node_exporter --web.telemetry-path=/foobar --web.listen-address=:9090 ": {"./node_exporter", "--web.listen-address=:9090", "--web.telemetry-path=/foobar"}, // overriding defaults + "./node_exporter --web.listen-address=:8080 --web.telemetry-path=/barfoo": {"./node_exporter", "--web.listen-address=:8080", "--web.telemetry-path=/barfoo"}, // overriding defaults different order and multiple spaces + "./node_exporter --web.listen-address=:9090 --collector.proc --web.telemetry-path=/foobar": {"./node_exporter", "--collector.proc", "--web.listen-address=:9090", "--web.telemetry-path=/foobar"}, // argument in between the persistent ones + "./node_exporter --web.listen-address=:9090 --collector.test --collector.systemd ": {"./node_exporter", "--collector.test", "--collector.systemd", "--web.listen-address=:9090", "--web.telemetry-path=/metrics"}, // argument after persistent one } for test, expected := range passTestcases { vargs := parseNodeExporterArgs(test, ":9100", "/metrics") @@ -40,10 +40,10 @@ func TestParseNodeExporterArgs(t *testing.T) { } failTestcases := map[string][]string{ - "./node_exporter": []string{"./node_exporter", "--web.listen-address=:9090", "--web.telemetry-path=/foobar"}, // default arguments not being passed - "./node_exporter --collector.systemd": []string{"./node_exporter", "--web.listen-address=:9100", "--web.telemetry-path=/metrics", "--collector.systemd"}, // incorrect order of persistent and added options - "./node_exporter random --collector.systemd": []string{"./node_exporter", "--collector.systemd", "random", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // reversed order of persistent options - " /usr/bin/local/node_exporter --collector.systemd random": []string{" /usr/bin/local/node_exporter", "--collector.systemd", "random", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // space at beginning of option preserved + "./node_exporter": {"./node_exporter", "--web.listen-address=:9090", "--web.telemetry-path=/foobar"}, // default arguments not being passed + "./node_exporter --collector.systemd": {"./node_exporter", "--web.listen-address=:9100", "--web.telemetry-path=/metrics", "--collector.systemd"}, // incorrect order of persistent and added options + "./node_exporter random --collector.systemd": {"./node_exporter", "--collector.systemd", "random", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // reversed order of persistent options + " /usr/bin/local/node_exporter --collector.systemd random": {" /usr/bin/local/node_exporter", "--collector.systemd", "random", "--web.listen-address=:9100", "--web.telemetry-path=/metrics"}, // space at beginning of option preserved } for test, notexpected := range failTestcases { vargs := parseNodeExporterArgs(test, ":9100", "/metrics")