From 85003279885fe374a477d5b324a143b8e428bed4 Mon Sep 17 00:00:00 2001
From: fx0x55 <80245546+fx0x55@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:42:23 +0800
Subject: [PATCH] refactor: eliminate unnecessary nil check in
 BigEndianToUint64 function

---
 x/crosschain/keeper/attestation.go        | 7 +------
 x/crosschain/keeper/batch_confirm.go      | 6 +-----
 x/crosschain/keeper/observed.go           | 6 +-----
 x/crosschain/keeper/oracle.go             | 6 +-----
 x/crosschain/keeper/oracle_set.go         | 6 +-----
 x/crosschain/keeper/oracle_set_confirm.go | 6 +-----
 6 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/x/crosschain/keeper/attestation.go b/x/crosschain/keeper/attestation.go
index c78f25e1..3445ed2a 100644
--- a/x/crosschain/keeper/attestation.go
+++ b/x/crosschain/keeper/attestation.go
@@ -246,10 +246,5 @@ func (k Keeper) SetLastEventBlockHeightByOracle(ctx sdk.Context, oracleAddr sdk.
 // GetLastEventBlockHeightByOracle get the latest event blockHeight for a give oracle
 func (k Keeper) GetLastEventBlockHeightByOracle(ctx sdk.Context, oracleAddr sdk.AccAddress) uint64 {
 	store := ctx.KVStore(k.storeKey)
-	key := types.GetLastEventBlockHeightByOracleKey(oracleAddr)
-	if !store.Has(key) {
-		return 0
-	}
-	data := store.Get(key)
-	return sdk.BigEndianToUint64(data)
+	return sdk.BigEndianToUint64(store.Get(types.GetLastEventBlockHeightByOracleKey(oracleAddr)))
 }
diff --git a/x/crosschain/keeper/batch_confirm.go b/x/crosschain/keeper/batch_confirm.go
index 7e5e0e7c..aa00abe8 100644
--- a/x/crosschain/keeper/batch_confirm.go
+++ b/x/crosschain/keeper/batch_confirm.go
@@ -65,11 +65,7 @@ func (k Keeper) SetLastSlashedBatchBlock(ctx sdk.Context, blockHeight uint64) {
 // GetLastSlashedBatchBlock returns the latest slashed Batch block
 func (k Keeper) GetLastSlashedBatchBlock(ctx sdk.Context) uint64 {
 	store := ctx.KVStore(k.storeKey)
-	bytes := store.Get(types.LastSlashedBatchBlock)
-	if len(bytes) == 0 {
-		return 0
-	}
-	return sdk.BigEndianToUint64(bytes)
+	return sdk.BigEndianToUint64(store.Get(types.LastSlashedBatchBlock))
 }
 
 // GetUnSlashedBatches returns all the unSlashed batches in state
diff --git a/x/crosschain/keeper/observed.go b/x/crosschain/keeper/observed.go
index 251ef685..ad29c163 100644
--- a/x/crosschain/keeper/observed.go
+++ b/x/crosschain/keeper/observed.go
@@ -11,11 +11,7 @@ import (
 // GetLastObservedEventNonce returns the latest observed event nonce
 func (k Keeper) GetLastObservedEventNonce(ctx sdk.Context) uint64 {
 	store := ctx.KVStore(k.storeKey)
-	bytes := store.Get(types.LastObservedEventNonceKey)
-	if len(bytes) == 0 {
-		return 0
-	}
-	return sdk.BigEndianToUint64(bytes)
+	return sdk.BigEndianToUint64(store.Get(types.LastObservedEventNonceKey))
 }
 
 // SetLastObservedEventNonce sets the latest observed event nonce
diff --git a/x/crosschain/keeper/oracle.go b/x/crosschain/keeper/oracle.go
index 67e92f6d..02f3dc09 100644
--- a/x/crosschain/keeper/oracle.go
+++ b/x/crosschain/keeper/oracle.go
@@ -226,9 +226,5 @@ func (k Keeper) SetLastOracleSlashBlockHeight(ctx sdk.Context, blockHeight uint6
 // GetLastOracleSlashBlockHeight returns the last proposal block height
 func (k Keeper) GetLastOracleSlashBlockHeight(ctx sdk.Context) uint64 {
 	store := ctx.KVStore(k.storeKey)
-	data := store.Get(types.LastOracleSlashBlockHeight)
-	if len(data) == 0 {
-		return 0
-	}
-	return sdk.BigEndianToUint64(data)
+	return sdk.BigEndianToUint64(store.Get(types.LastOracleSlashBlockHeight))
 }
diff --git a/x/crosschain/keeper/oracle_set.go b/x/crosschain/keeper/oracle_set.go
index 2191e8ec..60bcdcc0 100644
--- a/x/crosschain/keeper/oracle_set.go
+++ b/x/crosschain/keeper/oracle_set.go
@@ -184,11 +184,7 @@ func (k Keeper) SetLatestOracleSetNonce(ctx sdk.Context, nonce uint64) {
 // GetLatestOracleSetNonce returns the latest oracleSet nonce
 func (k Keeper) GetLatestOracleSetNonce(ctx sdk.Context) uint64 {
 	store := ctx.KVStore(k.storeKey)
-	data := store.Get(types.LatestOracleSetNonce)
-	if len(data) == 0 {
-		return 0
-	}
-	return sdk.BigEndianToUint64(data)
+	return sdk.BigEndianToUint64(store.Get(types.LatestOracleSetNonce))
 }
 
 // GetUnSlashedOracleSets returns all the unSlashed oracle sets in state
diff --git a/x/crosschain/keeper/oracle_set_confirm.go b/x/crosschain/keeper/oracle_set_confirm.go
index 4e076e48..4a79bddb 100644
--- a/x/crosschain/keeper/oracle_set_confirm.go
+++ b/x/crosschain/keeper/oracle_set_confirm.go
@@ -65,9 +65,5 @@ func (k Keeper) SetLastSlashedOracleSetNonce(ctx sdk.Context, nonce uint64) {
 // GetLastSlashedOracleSetNonce returns the latest slashed oracleSet nonce
 func (k Keeper) GetLastSlashedOracleSetNonce(ctx sdk.Context) uint64 {
 	store := ctx.KVStore(k.storeKey)
-	data := store.Get(types.LastSlashedOracleSetNonce)
-	if len(data) == 0 {
-		return 0
-	}
-	return sdk.BigEndianToUint64(data)
+	return sdk.BigEndianToUint64(store.Get(types.LastSlashedOracleSetNonce))
 }