From 7995c5ab9f2266ecc2c58bc936b98b3a98612064 Mon Sep 17 00:00:00 2001 From: Elizabeth Engelman Date: Wed, 13 Feb 2019 09:01:31 -0600 Subject: [PATCH] Apply go fmt changes --- core/blockchain_test.go | 6 +++--- statediff/builder/builder.go | 4 ++-- statediff/builder/builder_test.go | 8 ++++---- statediff/testhelpers/test_data.go | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 5adb072ac..e30e74e43 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -1500,7 +1500,7 @@ func TestProcessingStateDiffs(t *testing.T) { numberOfBlocks := triesInMemory engine := ethash.NewFaker() blockchain, _ := NewBlockChain(db, cacheConfig, params.AllEthashProtocolChanges, engine, vm.Config{}, nil) - blocks := makeBlockChain(genesis, numberOfBlocks + 1, engine, db, canonicalSeed) + blocks := makeBlockChain(genesis, numberOfBlocks+1, engine, db, canonicalSeed) _, err := blockchain.InsertChain(blocks) if err != nil { t.Fatalf("failed to create pristine chain: %v", err) @@ -1527,7 +1527,7 @@ func TestProcessingStateDiffs(t *testing.T) { t.Error("state root count not correct", "want", 2, "got", value) } - moreBlocks := makeBlockChain(blocks[len(blocks) - 1], 1, engine, db, canonicalSeed) + moreBlocks := makeBlockChain(blocks[len(blocks)-1], 1, engine, db, canonicalSeed) _, err = blockchain.InsertChain(moreBlocks) //a root hash can be dereferenced when it's state diff and it's child's state diff have been processed @@ -1556,7 +1556,7 @@ func TestProcessingStateDiffs(t *testing.T) { } } -func containsRootHash(collection []common.Hash, hash common.Hash) bool{ +func containsRootHash(collection []common.Hash, hash common.Hash) bool { for _, n := range collection { if n == hash { return true diff --git a/statediff/builder/builder.go b/statediff/builder/builder.go index bc60a27ef..a106c3ad8 100644 --- a/statediff/builder/builder.go +++ b/statediff/builder/builder.go @@ -22,12 +22,12 @@ package builder import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/core" ) type Builder interface { @@ -43,7 +43,7 @@ type AccountsMap map[common.Hash]*state.Account func NewBuilder(db ethdb.Database, blockChain *core.BlockChain) *builder { return &builder{ - chainDB: db, + chainDB: db, blockChain: blockChain, } } diff --git a/statediff/builder/builder_test.go b/statediff/builder/builder_test.go index 72189c05d..4f8b7c468 100644 --- a/statediff/builder/builder_test.go +++ b/statediff/builder/builder_test.go @@ -10,11 +10,11 @@ import ( "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/params" b "github.com/ethereum/go-ethereum/statediff/builder" - "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/statediff/testhelpers" ) @@ -23,7 +23,7 @@ var ( testBankKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") testBankAddress = crypto.PubkeyToAddress(testBankKey.PublicKey) //0x71562b71999873DB5b286dF957af199Ec94617F7 - bankLeafKey = testhelpers.AddressToLeafKey(testBankAddress) + bankLeafKey = testhelpers.AddressToLeafKey(testBankAddress) testBankFunds = big.NewInt(100000000) genesis = core.GenesisBlockForTesting(testdb, testBankAddress, testBankFunds) @@ -35,7 +35,7 @@ var ( account2LeafKey = testhelpers.AddressToLeafKey(account2Addr) contractCode = common.Hex2Bytes("608060405234801561001057600080fd5b50602060405190810160405280600160ff16815250600090600161003592919061003b565b506100a5565b826064810192821561006f579160200282015b8281111561006e578251829060ff1690559160200191906001019061004e565b5b50905061007c9190610080565b5090565b6100a291905b8082111561009e576000816000905550600101610086565b5090565b90565b610124806100b46000396000f3fe6080604052348015600f57600080fd5b5060043610604f576000357c01000000000000000000000000000000000000000000000000000000009004806360cd2685146054578063c16431b9146093575b600080fd5b607d60048036036020811015606857600080fd5b810190808035906020019092919050505060c8565b6040518082815260200191505060405180910390f35b60c66004803603604081101560a757600080fd5b81019080803590602001909291908035906020019092919050505060e0565b005b6000808260648110151560d757fe5b01549050919050565b8060008360648110151560ef57fe5b0181905550505056fea165627a7a7230582064e918c3140a117bf3aa65865a9b9e83fae21ad1720506e7933b2a9f54bb40260029") contractAddr common.Address - contractLeafKey common.Hash + contractLeafKey common.Hash emptyAccountDiffEventualMap = make(b.AccountDiffsMap) emptyAccountDiffIncrementalMap = make(b.AccountDiffsMap) block0Hash, block1Hash, block2Hash, block3Hash common.Hash @@ -43,7 +43,7 @@ var ( builder b.Builder miningReward = int64(2000000000000000000) burnAddress = common.HexToAddress("0x0") - burnLeafKey = testhelpers.AddressToLeafKey(burnAddress) + burnLeafKey = testhelpers.AddressToLeafKey(burnAddress) ) func TestBuilder(t *testing.T) { diff --git a/statediff/testhelpers/test_data.go b/statediff/testhelpers/test_data.go index b3ca15bc2..831bed218 100644 --- a/statediff/testhelpers/test_data.go +++ b/statediff/testhelpers/test_data.go @@ -5,11 +5,10 @@ import ( "math/rand" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/statediff/builder" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/statediff/builder" ) - func AddressToLeafKey(address common.Address) common.Hash { return common.BytesToHash(crypto.Keccak256(address[:])) }