From 41c981348e7d33c2d4bc05d146cc55c875d5fbd2 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Fri, 12 Sep 2014 14:04:03 -0500 Subject: [PATCH] Use byte literals to make go vet happy. The go vet command complains about untagged struct initializers when defining a ShaHash directly. This seems to be a limitation where go vet does not exclude the warning for types which are a constant size byte array like it does for normal constant size byte array definition. This commit simply modifies the code to use a constant definition cast to a ShaHash to overcome the limitation of go vet. --- genesis.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/genesis.go b/genesis.go index e3b6da18c6..f1f8117e09 100644 --- a/genesis.go +++ b/genesis.go @@ -56,21 +56,21 @@ var genesisCoinbaseTx = btcwire.MsgTx{ // genesisHash is the hash of the first block in the block chain for the main // network (genesis block). -var genesisHash = btcwire.ShaHash{ +var genesisHash = btcwire.ShaHash([btcwire.HashSize]byte{ // Make go vet happy. 0x6f, 0xe2, 0x8c, 0x0a, 0xb6, 0xf1, 0xb3, 0x72, 0xc1, 0xa6, 0xa2, 0x46, 0xae, 0x63, 0xf7, 0x4f, 0x93, 0x1e, 0x83, 0x65, 0xe1, 0x5a, 0x08, 0x9c, 0x68, 0xd6, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, -} +}) // genesisMerkleRoot is the hash of the first transaction in the genesis block // for the main network. -var genesisMerkleRoot = btcwire.ShaHash{ +var genesisMerkleRoot = btcwire.ShaHash([btcwire.HashSize]byte{ // Make go vet happy. 0x3b, 0xa3, 0xed, 0xfd, 0x7a, 0x7b, 0x12, 0xb2, 0x7a, 0xc7, 0x2c, 0x3e, 0x67, 0x76, 0x8f, 0x61, 0x7f, 0xc8, 0x1b, 0xc3, 0x88, 0x8a, 0x51, 0x32, 0x3a, 0x9f, 0xb8, 0xaa, 0x4b, 0x1e, 0x5e, 0x4a, -} +}) // genesisBlock defines the genesis block of the block chain which serves as the // public transaction ledger for the main network. @@ -88,12 +88,12 @@ var genesisBlock = btcwire.MsgBlock{ // regTestGenesisHash is the hash of the first block in the block chain for the // regression test network (genesis block). -var regTestGenesisHash = btcwire.ShaHash{ +var regTestGenesisHash = btcwire.ShaHash([btcwire.HashSize]byte{ // Make go vet happy. 0x06, 0x22, 0x6e, 0x46, 0x11, 0x1a, 0x0b, 0x59, 0xca, 0xaf, 0x12, 0x60, 0x43, 0xeb, 0x5b, 0xbf, 0x28, 0xc3, 0x4f, 0x3a, 0x5e, 0x33, 0x2a, 0x1f, 0xc7, 0xb2, 0xb7, 0x3c, 0xf1, 0x88, 0x91, 0x0f, -} +}) // regTestGenesisMerkleRoot is the hash of the first transaction in the genesis // block for the regression test network. It is the same as the merkle root for @@ -116,12 +116,12 @@ var regTestGenesisBlock = btcwire.MsgBlock{ // testNet3GenesisHash is the hash of the first block in the block chain for the // test network (version 3). -var testNet3GenesisHash = btcwire.ShaHash{ +var testNet3GenesisHash = btcwire.ShaHash([btcwire.HashSize]byte{ // Make go vet happy. 0x43, 0x49, 0x7f, 0xd7, 0xf8, 0x26, 0x95, 0x71, 0x08, 0xf4, 0xa3, 0x0f, 0xd9, 0xce, 0xc3, 0xae, 0xba, 0x79, 0x97, 0x20, 0x84, 0xe9, 0x0e, 0xad, 0x01, 0xea, 0x33, 0x09, 0x00, 0x00, 0x00, 0x00, -} +}) // testNet3GenesisMerkleRoot is the hash of the first transaction in the genesis // block for the test network (version 3). It is the same as the merkle root @@ -144,12 +144,12 @@ var testNet3GenesisBlock = btcwire.MsgBlock{ // simNetGenesisHash is the hash of the first block in the block chain for the // simulation test network. -var simNetGenesisHash = btcwire.ShaHash{ +var simNetGenesisHash = btcwire.ShaHash([btcwire.HashSize]byte{ // Make go vet happy. 0xf6, 0x7a, 0xd7, 0x69, 0x5d, 0x9b, 0x66, 0x2a, 0x72, 0xff, 0x3d, 0x8e, 0xdb, 0xbb, 0x2d, 0xe0, 0xbf, 0xa6, 0x7b, 0x13, 0x97, 0x4b, 0xb9, 0x91, 0x0d, 0x11, 0x6d, 0x5c, 0xbd, 0x86, 0x3e, 0x68, -} +}) // simNetGenesisMerkleRoot is the hash of the first transaction in the genesis // block for the simulation test network. It is the same as the merkle root for