Modified readpool to single balance configuration (#723)

Author: iamrz1

code/go/0chain.net/blobbercore/allocation/entity.go

@@ -197,9 +197,8 @@ func (Terms) TableName() string {
 // one for the allocations that the client (client_id) owns
 // and the other for the allocations that the client (client_id) doesn't own
 type ReadPool struct {
-ClientID string `gorm:"column:client_id;size:64;primaryKey" json:"client_id"`
-OwnerBalance int64 `gorm:"column:owner_balance;not null" json:"owner_balance"`
-VisitorBalance int64 `gorm:"column:visitor_balance;not null" json:"visitor_balance"`
+ClientID string `gorm:"column:client_id;size:64;primaryKey" json:"client_id"`
+Balance int64 `gorm:"column:balance;not null" json:"balance"`
 }
 
 func (ReadPool) TableName() string {
@@ -223,16 +222,13 @@ func GetReadPool(db *gorm.DB, clientID string) (*ReadPool, error) {
 return &rp, db.Model(&ReadPool{}).Where("client_id = ?", clientID).Scan(&rp).Error
 }
 
-func GetReadPoolsBalance(db *gorm.DB, clientID string, isOwner bool) (int64, error) {
+func GetReadPoolsBalance(db *gorm.DB, clientID string) (int64, error) {
 rp, err := GetReadPool(db, clientID)
 if err != nil {
 return 0, err
 }
 
-if isOwner {
-return rp.OwnerBalance, nil
-}
-return rp.VisitorBalance, nil
+return rp.Balance, nil
 }
 
 func SetReadPool(db *gorm.DB, rp *ReadPool) error {
@@ -242,7 +238,7 @@ func SetReadPool(db *gorm.DB, rp *ReadPool) error {
 return err
 }
 
-if erp.OwnerBalance == rp.OwnerBalance && erp.VisitorBalance == rp.VisitorBalance {
+if erp.Balance == rp.Balance {
 return nil
 }
 // update existing
@@ -251,8 +247,7 @@ func SetReadPool(db *gorm.DB, rp *ReadPool) error {
 
 func UpdateReadPool(db *gorm.DB, rp *ReadPool) error {
 return db.Model(&ReadPool{}).Where("client_id = ?", rp.ClientID).Updates(map[string]interface{}{
-"owner_balance": rp.OwnerBalance,
-"visitor_balance": rp.VisitorBalance,
+"balance": rp.Balance,
 }).Error
 }
 

code/go/0chain.net/blobbercore/handler/object_operation_handler.go

@@ -56,15 +56,14 @@ func readPreRedeem(ctx context.Context, alloc *allocation.Allocation, numBlocks,
 return // skip if read price is zero
 }
 
-isOwner := alloc.OwnerID == payerID
-readPoolsBalance, err := allocation.GetReadPoolsBalance(db, payerID, isOwner)
+readPoolBalance, err := allocation.GetReadPoolsBalance(db, payerID)
 if err != nil {
 return common.NewError("read_pre_redeem", "database error while reading read pools balance")
 }
 
 requiredBalance := alloc.GetRequiredReadBalance(blobberID, numBlocks+pendNumBlocks)
 
-if float64(readPoolsBalance) < requiredBalance {
+if float64(readPoolBalance) < requiredBalance {
 rp, err := allocation.RequestReadPoolStat(payerID)
 if err != nil {
 return common.NewErrorf("read_pre_redeem", "can't request read pools from sharders: %v", err)
@@ -76,13 +75,9 @@ func readPreRedeem(ctx context.Context, alloc *allocation.Allocation, numBlocks,
 return common.NewErrorf("read_pre_redeem", "can't save requested read pools: %v", err)
 }
 
-if isOwner {
-readPoolsBalance = rp.OwnerBalance
-} else {
-readPoolsBalance = rp.VisitorBalance
-}
+readPoolBalance = rp.Balance
 
-if float64(readPoolsBalance) < requiredBalance {
+if float64(readPoolBalance) < requiredBalance {
 return common.NewError("read_pre_redeem",
 "not enough tokens in client's read pools associated with the allocation->blobber")
 }

code/go/0chain.net/blobbercore/handler/object_operation_handler_test.go

@@ -162,15 +162,13 @@ func TestDownloadFile(t *testing.T) {
 require.EqualValues(t, scAddress, transaction.STORAGE_CONTRACT_ADDRESS)
 switch relativePath {
 case "/getReadPoolStat":
-//require.False(t, p.isFundedBlobber) //todo: why is this relevant?
 require.EqualValues(t, p.payerId.ClientID, params["client_id"])
 var funds int64
 if p.isFunded0Chain {
 funds = mockBigBalance
 }
 rp := allocation.ReadPool{
-OwnerBalance: funds,
-VisitorBalance: funds,
+Balance: funds,
 }
 
 mbytes, err := json.Marshal(&rp)
@@ -264,17 +262,10 @@ func TestDownloadFile(t *testing.T) {
 funds = mockBigBalance
 }
 
-if p.isOwner {
-mocket.Catcher.NewMock().WithCallback(func(par1 string, args []driver.NamedValue) {
-}).OneTime().WithQuery(`SELECT * FROM "read_pools" WHERE`).WithReply(
-[]map[string]interface{}{{"client_id": p.payerId.ClientID, "owner_balance": funds}},
-)
-} else {
-mocket.Catcher.NewMock().WithCallback(func(par1 string, args []driver.NamedValue) {
-}).OneTime().WithQuery(`SELECT * FROM "read_pools" WHERE`).WithReply(
-[]map[string]interface{}{{"client_id": p.payerId.ClientID, "visitor_balance": funds}},
-)
-}
+mocket.Catcher.NewMock().WithCallback(func(par1 string, args []driver.NamedValue) {
+}).OneTime().WithQuery(`SELECT * FROM "read_pools" WHERE`).WithReply(
+[]map[string]interface{}{{"client_id": p.payerId.ClientID, "balance": funds}},
+)
 
 if p.useAuthTicket {
 mocket.Catcher.NewMock().OneTime().WithQuery(