From dce96330f2301f133d011d048d2f8684d054c468 Mon Sep 17 00:00:00 2001
From: Jon <Schwartz10@users.noreply.github.com>
Date: Thu, 22 Feb 2024 19:59:14 -0800
Subject: [PATCH] Remove dedup (#72)
---
events/agfactory.go | 7 +------
events/infpool.go | 18 +++---------------
events/minerreg.go | 12 ++----------
events/prestake.go | 7 +------
events/simpleramp.go | 6 +-----
events/wfil.go | 14 ++------------
6 files changed, 10 insertions(+), 54 deletions(-)
diff --git a/events/agfactory.go b/events/agfactory.go
index 2115f5a..9273dae 100644
--- a/events/agfactory.go
+++ b/events/agfactory.go
@@ -22,8 +22,6 @@ func AgFactoryCreateAgentEvents(ctx context.Context, sdk types.PoolsSDK, startEp
}
var events []*abigen.AgentFactoryCreateAgent
- // to do - can remove hashmap logic when https://github.com/filecoin-project/lotus/issues/10964 gets merged
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -37,10 +35,7 @@ func AgFactoryCreateAgentEvents(ctx context.Context, sdk types.PoolsSDK, startEp
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}
diff --git a/events/infpool.go b/events/infpool.go
index f3cc592..906b683 100644
--- a/events/infpool.go
+++ b/events/infpool.go
@@ -21,7 +21,6 @@ func InfPoolBorrowEvents(ctx context.Context, sdk types.PoolsSDK, agentsFilter [
}
var events []*abigen.InfinityPoolBorrow
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -35,10 +34,7 @@ func InfPoolBorrowEvents(ctx context.Context, sdk types.PoolsSDK, agentsFilter [
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}
return events, nil
@@ -56,7 +52,6 @@ func InfPoolPayEvents(ctx context.Context, sdk types.PoolsSDK, agentsFilter []*b
}
var events []*abigen.InfinityPoolPay
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -70,10 +65,7 @@ func InfPoolPayEvents(ctx context.Context, sdk types.PoolsSDK, agentsFilter []*b
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}
@@ -92,7 +84,6 @@ func InfPoolDepositEvents(ctx context.Context, sdk types.PoolsSDK, startEpoch *b
}
var events []*abigen.InfinityPoolDeposit
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -106,10 +97,7 @@ func InfPoolDepositEvents(ctx context.Context, sdk types.PoolsSDK, startEpoch *b
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}
diff --git a/events/minerreg.go b/events/minerreg.go
index 8a759ba..0ad7c36 100644
--- a/events/minerreg.go
+++ b/events/minerreg.go
@@ -22,7 +22,6 @@ func MinerRegAddMinerEvents(ctx context.Context, sdk types.PoolsSDK, agentsFilte
}
var addMinerEvents []*abigen.MinerRegistryAddMiner
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -36,10 +35,7 @@ func MinerRegAddMinerEvents(ctx context.Context, sdk types.PoolsSDK, agentsFilte
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- addMinerEvents = append(addMinerEvents, iter.Event)
- }
+ addMinerEvents = append(addMinerEvents, iter.Event)
}
}
@@ -58,7 +54,6 @@ func MinerRegRmMinerEvents(ctx context.Context, sdk types.PoolsSDK, agentsFilter
}
var events []*abigen.MinerRegistryRemoveMiner
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -71,10 +66,7 @@ func MinerRegRmMinerEvents(ctx context.Context, sdk types.PoolsSDK, agentsFilter
return []*abigen.MinerRegistryRemoveMiner{}, err
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}
diff --git a/events/prestake.go b/events/prestake.go
index 00d5d5d..b29cdf4 100644
--- a/events/prestake.go
+++ b/events/prestake.go
@@ -23,8 +23,6 @@ func PrestakeEvents(ctx context.Context, sdk types.PoolsSDK, startEpoch *big.Int
}
var events []*abigen.PreStakeDeposit
- // to do - can remove hashmap logic when https://github.com/filecoin-project/lotus/issues/10964 gets merged
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -38,10 +36,7 @@ func PrestakeEvents(ctx context.Context, sdk types.PoolsSDK, startEpoch *big.Int
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}
diff --git a/events/simpleramp.go b/events/simpleramp.go
index 1f112ef..9972e32 100644
--- a/events/simpleramp.go
+++ b/events/simpleramp.go
@@ -22,7 +22,6 @@ func SimpleRampWithdrawEvents(ctx context.Context, sdk types.PoolsSDK, caller []
}
var events []*abigen.SimpleRampWithdraw
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -36,10 +35,7 @@ func SimpleRampWithdrawEvents(ctx context.Context, sdk types.PoolsSDK, caller []
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}
return events, nil
diff --git a/events/wfil.go b/events/wfil.go
index 00d437a..8ae4e53 100644
--- a/events/wfil.go
+++ b/events/wfil.go
@@ -23,8 +23,6 @@ func WFilDepositEvents(ctx context.Context, sdk types.PoolsSDK, startEpoch *big.
}
var events []*abigen.WFILDeposit
- // to do - can remove hashmap logic when https://github.com/filecoin-project/lotus/issues/10964 gets merged
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -38,10 +36,7 @@ func WFilDepositEvents(ctx context.Context, sdk types.PoolsSDK, startEpoch *big.
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}
@@ -61,8 +56,6 @@ func WFilTransferEvents(ctx context.Context, sdk types.PoolsSDK, startEpoch *big
}
var events []*abigen.WFILTransfer
- // to do - can remove hashmap logic when https://github.com/filecoin-project/lotus/issues/10964 gets merged
- var hashmap = make(map[string]bool)
for i := startEpoch; i.Cmp(endEpoch) == -1; i.Add(i, constants.CHUNKSIZE) {
end := big.NewInt(0).Add(i, constants.CHUNKSIZE)
@@ -76,10 +69,7 @@ func WFilTransferEvents(ctx context.Context, sdk types.PoolsSDK, startEpoch *big
}
for iter.Next() {
- if _, ok := hashmap[iter.Event.Raw.TxHash.Hex()]; !ok {
- hashmap[iter.Event.Raw.TxHash.Hex()] = true
- events = append(events, iter.Event)
- }
+ events = append(events, iter.Event)
}
}