Merge pull request #110 from ethstorage/issues

expose miningInfo Attributes to other package
ethstorage · Dec 1, 2023 · 28fceaa · 28fceaa
2 parents 4de97f9 + d247be2
commit 28fceaa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/ethstorage/miner/l1_mining_api.go b/ethstorage/miner/l1_mining_api.go
@@ -52,9 +52,9 @@ func (m *l1MiningAPI) GetMiningInfo(ctx context.Context, contract common.Address
 		return nil, err
 	}
 	mi := &miningInfo{
-		lastMineTime: res[0].(*big.Int).Uint64(),
-		difficulty:   res[1].(*big.Int),
-		blockMined:   res[2].(*big.Int),
+		LastMineTime: res[0].(*big.Int).Uint64(),
+		Difficulty:   res[1].(*big.Int),
+		BlockMined:   res[2].(*big.Int),
 	}
 	return mi, nil
 }

diff --git a/ethstorage/miner/miner.go b/ethstorage/miner/miner.go
@@ -31,17 +31,17 @@ type MiningProver interface {
 }
 
 type miningInfo struct {
-	lastMineTime uint64
-	difficulty   *big.Int
-	blockMined   *big.Int
+	LastMineTime uint64
+	Difficulty   *big.Int
+	BlockMined   *big.Int
 }
 
 func (a *miningInfo) String() string {
 	return fmt.Sprintf(
 		"LastMineTime: %d, Difficulty: %s, BlockMined: %s",
-		a.lastMineTime,
-		a.difficulty.String(),
-		a.blockMined.String(),
+		a.LastMineTime,
+		a.Difficulty.String(),
+		a.BlockMined.String(),
 	)
 }
 

diff --git a/ethstorage/miner/worker.go b/ethstorage/miner/worker.go
@@ -235,11 +235,11 @@ func (w *worker) updateDifficulty(shardIdx, blockTime uint64) (*big.Int, error)
 		w.lg.Warn("Failed to get es mining info", "error", err.Error())
 		return nil, err
 	}
-	w.lg.Info("Mining info retrieved", "shard", shardIdx, "lastMineTime", info.lastMineTime, "difficulty", info.difficulty, "proofsSubmitted", info.blockMined)
+	w.lg.Info("Mining info retrieved", "shard", shardIdx, "LastMineTime", info.LastMineTime, "Difficulty", info.Difficulty, "proofsSubmitted", info.BlockMined)
 	reqDiff := new(big.Int).Div(maxUint256, expectedDiff(
-		info.lastMineTime,
+		info.LastMineTime,
 		blockTime,
-		info.difficulty,
+		info.Difficulty,
 		w.config.Cutoff,
 		w.config.DiffAdjDivisor,
 		w.config.MinimumDiff,