TrueCloudLab/frostfs-node
19
1
Fork 27
Code Issues 91 Pull requests 8 Projects Releases 1 Activity Actions

[#365] settlement/basic: Use big.Int constructor for unification

Browse source 
Check if `new(big.Int)` will be efficient later and replace
all `big.NewInt()` in code or leave it as it is.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2021-02-03 15:07:37 +03:00 committed by Alex Vanin
parent 6a9a2b5d04
commit 3775d61ccb
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/innerring/processors/settlement/basic/collect.go
View file

@ -93,7 +93,7 @@ func calculateBasicSum(size, rate uint64, ln int) *big.Int {
total := size * uint64(ln) total := size * uint64(ln)
price := new(big.Int).SetUint64(total) price := big.NewInt(0).SetUint64(total)
price.Mul(price, bigRate) price.Mul(price, bigRate)
price.Div(price, bigGB) price.Div(price, bigGB)

2
pkg/innerring/processors/settlement/basic/distribute.go
View file

@ -46,7 +46,7 @@ func (inc *IncomeSettlementContext) Distribute() {
func normalizedValue(n, total, limit *big.Int) *big.Int { func normalizedValue(n, total, limit *big.Int) *big.Int {
if limit.Cmp(bigZero) == 0 { if limit.Cmp(bigZero) == 0 {
return new(big.Int) return big.NewInt(0)
} }
n.Mul(n, limit) n.Mul(n, limit)

8
pkg/innerring/processors/settlement/basic/distribute_test.go
View file

@ -44,10 +44,10 @@ func TestNormalizedValues(t *testing.T) {
} }
func testNormalizedValues(t *testing.T, c normalizedValueCase) { func testNormalizedValues(t *testing.T, c normalizedValueCase) {
n := new(big.Int).SetUint64(c.n) n := big.NewInt(0).SetUint64(c.n)
total := new(big.Int).SetUint64(c.total) total := big.NewInt(0).SetUint64(c.total)
limit := new(big.Int).SetUint64(c.limit) limit := big.NewInt(0).SetUint64(c.limit)
exp := new(big.Int).SetUint64(c.expected) exp := big.NewInt(0).SetUint64(c.expected)
got := normalizedValue(n, total, limit) got := normalizedValue(n, total, limit)
require.Zero(t, exp.Cmp(got), c.name) require.Zero(t, exp.Cmp(got), c.name)

4
pkg/innerring/processors/settlement/basic/util.go
View file

@ -17,12 +17,12 @@ func (t *NodeSizeTable) Put(id []byte, avg uint64) {
} }
func (t *NodeSizeTable) Total() *big.Int { func (t *NodeSizeTable) Total() *big.Int {
return new(big.Int).SetUint64(t.total) return big.NewInt(0).SetUint64(t.total)
} }
func (t *NodeSizeTable) Iterate(f func([]byte, *big.Int)) { func (t *NodeSizeTable) Iterate(f func([]byte, *big.Int)) {
for k, v := range t.prices { for k, v := range t.prices {
n := new(big.Int).SetUint64(v) n := big.NewInt(0).SetUint64(v)
f([]byte(k), n) f([]byte(k), n)
} }
} }