Merge pull request #38 from getamis/develop

Release v0.2.1
getamis · Jul 5, 2018 · b4e9def · b4e9def
2 parents 1c4efed + 4411d1a
commit b4e9def
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 34 deletions.
diff --git a/store/subscription/mocks/Store.go b/store/subscription/mocks/Store.go
diff --git a/store/subscription/subscription.go b/store/subscription/subscription.go
@@ -29,7 +29,8 @@ type Store interface {
 	BatchInsert(subs []*model.Subscription) error
 	BatchUpdateBlockNumber(blockNumber int64, addrs [][]byte) error
 	Find(blockNumber int64) (result []*model.Subscription, err error)
-	FindByAddresses(addrs [][]byte) (result []*model.Subscription, err error)
+	// FindOldSubscriptions find old subscriptions by addresses
+	FindOldSubscriptions(addrs [][]byte) (result []*model.Subscription, err error)
 	FindByGroup(groupID int64, query *model.QueryParameters) (result []*model.Subscription, total uint64, err error)
 
 	// Total balance
@@ -82,12 +83,12 @@ func (t *store) Find(blockNumber int64) (result []*model.Subscription, err error
 	return
 }
 
-func (t *store) FindByAddresses(addrs [][]byte) (result []*model.Subscription, err error) {
+func (t *store) FindOldSubscriptions(addrs [][]byte) (result []*model.Subscription, err error) {
 	if len(addrs) == 0 {
 		return []*model.Subscription{}, nil
 	}
 
-	err = t.db.Where("address in (?)", addrs).Find(&result).Error
+	err = t.db.Where("address in (?) AND block_number > 0", addrs).Find(&result).Error
 	if err != nil {
 		return
 	}

diff --git a/store/subscription/subscription_test.go b/store/subscription/subscription_test.go
@@ -142,7 +142,7 @@ var _ = Describe("Database Test", func() {
 			err := store.BatchInsert(data)
 			Expect(err).Should(Succeed())
 
-			res, err := store.FindByAddresses([][]byte{
+			res, err := store.FindOldSubscriptions([][]byte{
 				data0.Address,
 				data1.Address,
 				data2.Address,
@@ -151,7 +151,7 @@ var _ = Describe("Database Test", func() {
 			Expect(err).Should(Succeed())
 			Expect(len(res)).Should(BeNumerically("==", 2))
 
-			res, err = store.FindByAddresses([][]byte{
+			res, err = store.FindOldSubscriptions([][]byte{
 				data0.Address,
 				data1.Address,
 				common.HexToBytes("0xB287a379e6caCa6732E50b88D23c290aA990A895"),
@@ -160,7 +160,7 @@ var _ = Describe("Database Test", func() {
 			Expect(err).Should(Succeed())
 			Expect(len(res)).Should(BeNumerically("==", 1))
 
-			res, err = store.FindByAddresses([][]byte{
+			res, err = store.FindOldSubscriptions([][]byte{
 				data0.Address,
 				common.HexToBytes("0xB287a379e6caCa6732E50b88D23c290aA990A895"),
 				common.HexToBytes("0xB287a379e6caCa6732E50b88D23c290aA990A896"),
@@ -172,14 +172,14 @@ var _ = Describe("Database Test", func() {
 			err = store.Reset(100, 102)
 			Expect(err).Should(Succeed())
 
-			res, err = store.FindByAddresses([][]byte{
+			res, err = store.FindOldSubscriptions([][]byte{
 				data0.Address,
 				data1.Address,
 				data2.Address,
 				data3.Address,
 			})
 			Expect(err).Should(Succeed())
-			Expect(len(res)).Should(BeNumerically("==", 3))
+			Expect(len(res)).Should(BeZero())
 		})
 
 		Context("FindByGroup", func() {

diff --git a/store/transfer_processor.go b/store/transfer_processor.go
@@ -113,7 +113,7 @@ func (s *transferProcessor) process(ctx context.Context, events []*model.Transfe
 	}
 
 	// Get subscribed accounts whose balances are changed, including the new subscriptions
-	subs, err := s.subStore.FindByAddresses(addrs)
+	subs, err := s.subStore.FindOldSubscriptions(addrs)
 	if err != nil {
 		s.logger.Error("Failed to find subscription address", "len", len(addrs), "err", err)
 		return err
@@ -257,13 +257,18 @@ func (s *transferProcessor) process(ctx context.Context, events []*model.Transfe
 			}
 			totalBalances[sub.Group][token] = new(big.Int).Add(tb, d)
 
+			// Consider tx fees
 			if f, ok := feeDiff[addr]; ok && token == model.ETHAddress {
 				if totalFees[sub.Group] == nil {
 					totalFees[sub.Group] = new(big.Int).Set(f)
 				} else {
 					totalFees[sub.Group] = new(big.Int).Add(f, totalFees[sub.Group])
 				}
-				totalBalances[sub.Group][token] = new(big.Int).Sub(totalBalances[sub.Group][token], f)
+
+				// Subtract tx fee from total balance if it's not a new subscriptions.
+				if newSubs[addr] == nil {
+					totalBalances[sub.Group][token] = new(big.Int).Sub(totalBalances[sub.Group][token], f)
+				}
 			}
 		}
 	}

diff --git a/store/transfer_processor_test.go b/store/transfer_processor_test.go
@@ -344,7 +344,7 @@ var _ = Describe("Subscription Test", func() {
 		Expect(et2_101.Balance).Should(Equal("498"))
 
 		// Verify new subscriptions' block numbers updated
-		res, err := subStore.FindByAddresses([][]byte{subs[0].Address, subs[1].Address, subs[2].Address})
+		res, err := subStore.FindOldSubscriptions([][]byte{subs[0].Address, subs[1].Address, subs[2].Address})
 		Expect(err).Should(BeNil())
 		Expect(res[0].BlockNumber).Should(Equal(int64(90)))
 		Expect(res[1].BlockNumber).Should(Equal(int64(100)))