Skip to content

refactor: use the built-in max/min to simplify the code #1632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pkucode wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

refactor: use the built-in max/min to simplify the code #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion store/iavl/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ func (node *Node) getRightNode(t *ImmutableTree) *Node {

// NOTE: mutates height and size
func (node *Node) calcHeightAndSize(t *ImmutableTree) {
node.height = maxInt8(node.getLeftNode(t).height, node.getRightNode(t).height) + 1
node.height = max(node.getLeftNode(t).height, node.getRightNode(t).height) + 1
node.size = node.getLeftNode(t).size + node.getRightNode(t).size
}

Expand Down
7 changes: 0 additions & 7 deletions store/iavl/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ func debug(format string, args ...interface{}) {
}
}

func maxInt8(a, b int8) int8 {
if a > b {
return a
}
return b
}

// Returns a slice of the same length (big endian)
// except incremented by one.
// Appends 0x00 if bz is all 0xFF.
Expand Down
32 changes: 2 additions & 30 deletions types/int_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,6 @@ func TestIdentInt(t *testing.T) {
}
}

func minint(i1, i2 int64) int64 {
if i1 < i2 {
return i1
}
return i2
}

func maxint(i1, i2 int64) int64 {
if i1 > i2 {
return i1
}
return i2
}

func TestArithInt(t *testing.T) {
for d := 0; d < 1000; d++ {
n1 := int64(rand.Int31())
Expand All @@ -131,8 +117,8 @@ func TestArithInt(t *testing.T) {
{i1.SubRaw(n2), n1 - n2},
{i1.MulRaw(n2), n1 * n2},
{i1.QuoRaw(n2), n1 / n2},
{MinInt(i1, i2), minint(n1, n2)},
{MaxInt(i1, i2), maxint(n1, n2)},
{min(i1, i2), min(n1, n2)},
{max(i1, i2), max(n1, n2)},
{i1.Neg(), -n1},
}

Expand Down Expand Up @@ -165,20 +151,6 @@ func TestCompInt(t *testing.T) {
}
}

func minuint(i1, i2 uint64) uint64 {
if i1 < i2 {
return i1
}
return i2
}

func maxuint(i1, i2 uint64) uint64 {
if i1 > i2 {
return i1
}
return i2
}

func randint() BigInt {
return NewInt(rand.Int63())
}
Expand Down