From b5c0113d29aac63aa6af0dcca9026cc04f6f45b0 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Sat, 8 Sep 2018 06:49:03 -0400 Subject: [PATCH] fix errors relating to referencing clique (#9) --- consensus/aura/aura.go | 2 +- consensus/aura/snapshot.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/consensus/aura/aura.go b/consensus/aura/aura.go index 78c5f54b7e..876fd72793 100644 --- a/consensus/aura/aura.go +++ b/consensus/aura/aura.go @@ -193,7 +193,7 @@ func ecrecover(header *types.Header, sigcache *lru.ARCCache) (common.Address, er // Clique is the proof-of-authority consensus engine proposed to support the // Ethereum testnet following the Ropsten attacks. type Aura struct { - config *params.CliqueConfig // Consensus engine configuration parameters + config *params.AuraConfig // Consensus engine configuration parameters db ethdb.Database // Database to store and retrieve snapshot checkpoints recents *lru.ARCCache // Snapshots for recent block to speed up reorgs diff --git a/consensus/aura/snapshot.go b/consensus/aura/snapshot.go index df2d46f22d..14ff8a2eb6 100644 --- a/consensus/aura/snapshot.go +++ b/consensus/aura/snapshot.go @@ -46,7 +46,7 @@ type Tally struct { // Snapshot is the state of the authorization voting at a given point in time. type Snapshot struct { - config *params.CliqueConfig // Consensus engine parameters to fine tune behavior + config *params.AuraConfig // Consensus engine parameters to fine tune behavior sigcache *lru.ARCCache // Cache of recent block signatures to speed up ecrecover Number uint64 `json:"number"` // Block number where the snapshot was created @@ -67,7 +67,7 @@ func (s signers) Swap(i, j int) { s[i], s[j] = s[j], s[i] } // newSnapshot creates a new snapshot with the specified startup parameters. This // method does not initialize the set of recent signers, so only ever use if for // the genesis block. -func newSnapshot(config *params.CliqueConfig, sigcache *lru.ARCCache, number uint64, hash common.Hash, signers []common.Address) *Snapshot { +func newSnapshot(config *params.AuraConfig, sigcache *lru.ARCCache, number uint64, hash common.Hash, signers []common.Address) *Snapshot { snap := &Snapshot{ config: config, sigcache: sigcache, @@ -84,7 +84,7 @@ func newSnapshot(config *params.CliqueConfig, sigcache *lru.ARCCache, number uin } // loadSnapshot loads an existing snapshot from the database. -func loadSnapshot(config *params.CliqueConfig, sigcache *lru.ARCCache, db ethdb.Database, hash common.Hash) (*Snapshot, error) { +func loadSnapshot(config *params.AuraConfig, sigcache *lru.ARCCache, db ethdb.Database, hash common.Hash) (*Snapshot, error) { blob, err := db.Get(append([]byte("clique-"), hash[:]...)) if err != nil { return nil, err