finished remaining lint errors after rebase main

dominant-strategies · Apr 11, 2023 · 9052add · 9052add
1 parent 2c25004
commit 9052add
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 26 deletions.
diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go
@@ -196,11 +196,6 @@ func phBodyTerminiKey(hash common.Hash) []byte {
 	return append(phTerminiPrefix, hash.Bytes()...)
 }
 
-// headerTDKey = headerPrefix + num (uint64 big endian) + hash + headerTDSuffix
-func headerTDKey(number uint64, hash common.Hash) []byte {
-	return append(headerKey(number, hash), headerTDSuffix...)
-}
-
 // phCacheEntropyKey = phEntropyPrefix + hash
 func phCacheEntropyKey(hash common.Hash) []byte {
 	return append(phEntropyPrefix, hash.Bytes()...)

diff --git a/internal/quaiapi/api.go b/internal/quaiapi/api.go
@@ -900,14 +900,6 @@ func RPCMarshalETHBlock(block *types.Block, inclTx bool, fullTx bool) (map[strin
 	return fields, nil
 }
 
-// rpcMarshalHeader uses the generalized output filler, then adds the total difficulty field, which requires
-// a `PublicBlockchainAPI`.
-func (s *PublicBlockChainAPI) rpcMarshalHeader(ctx context.Context, header *types.Header) map[string]interface{} {
-	fields := RPCMarshalETHHeader(header)
-	fields["totalEntropy"] = (*hexutil.Big)(header.CalcS())
-	return fields
-}
-
 // rpcMarshalBlock uses the generalized output filler, then adds the total difficulty field, which requires
 // a `PublicBlockchainAPI`.
 func (s *PublicBlockChainAPI) rpcMarshalBlock(ctx context.Context, b *types.Block, inclTx bool, fullTx bool) (map[string]interface{}, error) {

diff --git a/internal/quaiapi/quai_api.go b/internal/quaiapi/quai_api.go
@@ -467,14 +467,6 @@ func RPCMarshalHash(hash common.Hash) (map[string]interface{}, error) {
 	return fields, nil
 }
 
-// rpcMarshalHeader uses the generalized output filler, then adds the total difficulty field, which requires
-// a `PublicBlockchainQuaiAPI`.
-func (s *PublicBlockChainQuaiAPI) rpcMarshalHeader(ctx context.Context, header *types.Header) map[string]interface{} {
-	fields := header.RPCMarshalHeader()
-	fields["totalEntropy"] = (*hexutil.Big)(header.CalcS())
-	return fields
-}
-
 // rpcMarshalBlock uses the generalized output filler, then adds the total difficulty field, which requires
 // a `PublicBlockchainAPI`.
 func (s *PublicBlockChainQuaiAPI) rpcMarshalBlock(ctx context.Context, b *types.Block, inclTx bool, fullTx bool) (map[string]interface{}, error) {

diff --git a/params/bootnodes.go b/params/bootnodes.go
@@ -46,9 +46,9 @@ var OrchardBootnodes = []string{
 // GalenaBootnodes are the enode URLs of the P2P bootstrap nodes running on the
 // Galena test network
 var GalenaBootnodes = []string{
-	"enode://12fa0822887c7c8829c1d30e7aaf430587cc71827f5ab2028ee39acf02c113eb01a4c130258074d3c7868f68280f854036a8a51beb4df96af314f94c7f45966e@34.175.138.4",  // europe-southwest1-a
-	"enode://1dab5f7739dfd6fb037a676607fc86ecc76eff3906abaa8f8662e236eb01937b27db1309c89e0c3af807a64b491f401f52ff75daca49689c99cfe949c359623c@35.199.83.89",  // southamerica-east1-b
-	"enode://402a7cc416700f8717ff35416dfcb3c286921bc4261a9e8cc9948cfac9e3589c8db25fffcf7d6877ec0e7ad93c83e6bde93d4918923dfb9c24c1635a57c5aba2@34.64.122.86",  // asia-northeast3-a
+	"enode://12fa0822887c7c8829c1d30e7aaf430587cc71827f5ab2028ee39acf02c113eb01a4c130258074d3c7868f68280f854036a8a51beb4df96af314f94c7f45966e@34.175.138.4", // europe-southwest1-a
+	"enode://1dab5f7739dfd6fb037a676607fc86ecc76eff3906abaa8f8662e236eb01937b27db1309c89e0c3af807a64b491f401f52ff75daca49689c99cfe949c359623c@35.199.83.89", // southamerica-east1-b
+	"enode://402a7cc416700f8717ff35416dfcb3c286921bc4261a9e8cc9948cfac9e3589c8db25fffcf7d6877ec0e7ad93c83e6bde93d4918923dfb9c24c1635a57c5aba2@34.64.122.86", // asia-northeast3-a
 }
 
 var V5Bootnodes = []string{}

diff --git a/params/config.go b/params/config.go
@@ -29,7 +29,7 @@ var (
 	GardenGenesisHash    = common.HexToHash("0x779f1d7a78675498ba77bc5b47d54fd76033d6e8e89729216ecf365a71c8736c")
 	OrchardGenesisHash   = common.HexToHash("0xdc2c8f2c92e18ab8673b8b6291bc02350191f14161c4d881b741d3fb081996f7")
 	LocalGenesisHash     = common.HexToHash("0xe0858f853c8965341f99c1baf54aa3404f5e5480226e895c7489dfc77cb69deb")
-	GalenaGenesisHash	 = common.HexToHash("0xa5951ca01396546d238c8c900c86bd10894905a04c3f6902142345aabbff7947")
+	GalenaGenesisHash    = common.HexToHash("0xa5951ca01396546d238c8c900c86bd10894905a04c3f6902142345aabbff7947")
 )
 
 var (
@@ -116,7 +116,6 @@ var (
 		Blake3pow:           new(Blake3powConfig),
 		GenesisHash:         GalenaGenesisHash,
 	}
-
 
 	// LocalChainConfig contains the chain parameters to run a node on the Local test network.
 	LocalChainConfig = &ChainConfig{