Skip to content

Commit

Permalink
Remove dedup (#72)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Schwartz10
Schwartz10 authored Feb 23, 2024
1 parent 916e51b commit dce9633
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 54 deletions.
7 changes: 1 addition & 6 deletions events/agfactory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
}

Expand Down
18 changes: 3 additions & 15 deletions events/infpool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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)
}
}

Expand All @@ -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)
Expand All @@ -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)
}
}

Expand Down
12 changes: 2 additions & 10 deletions events/minerreg.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
}

Expand All @@ -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)
Expand All @@ -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)
}
}

Expand Down
7 changes: 1 addition & 6 deletions events/prestake.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
}

Expand Down
6 changes: 1 addition & 5 deletions events/simpleramp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
14 changes: 2 additions & 12 deletions events/wfil.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
}

Expand All @@ -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)
Expand All @@ -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)
}
}

Expand Down

0 comments on commit dce9633

Please sign in to comment.