From a8a44aa988b7c384b1515d78f2e54c11e91f3e96 Mon Sep 17 00:00:00 2001
From: Jonathan Moody <103143855+moodyjon@users.noreply.github.com>
Date: Thu, 14 Jul 2022 18:06:27 -0400
Subject: [PATCH] [rpc mempool] Hide debugging functionality of
 dynamicMemUsage().

---
 mempool/mempool.go  |  8 ++++----
 mempool/memusage.go | 20 ++++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/mempool/mempool.go b/mempool/mempool.go
index 688e532d..4ef5a018 100644
--- a/mempool/mempool.go
+++ b/mempool/mempool.go
@@ -179,14 +179,14 @@ type TxDesc struct {
 func (txD *TxDesc) incr(info *aggregateInfo) {
 	info.totalCount += 1
 	info.totalBytes += int64(txD.Tx.MsgTx().SerializeSize())
-	info.totalMem += int64(dynamicMemUsage(reflect.ValueOf(txD), false, 0))
+	info.totalMem += int64(dynamicMemUsage(reflect.ValueOf(txD)))
 	info.totalFee += txD.Fee
 }
 
 func (txD *TxDesc) decr(info *aggregateInfo) {
 	info.totalCount -= 1
 	info.totalBytes -= int64(txD.Tx.MsgTx().SerializeSize())
-	info.totalMem -= int64(dynamicMemUsage(reflect.ValueOf(txD), false, 0))
+	info.totalMem -= int64(dynamicMemUsage(reflect.ValueOf(txD)))
 	info.totalFee -= txD.Fee
 }
 
@@ -202,13 +202,13 @@ type orphanTx struct {
 func (otx *orphanTx) incr(info *aggregateInfo) {
 	info.totalCount += 1
 	info.totalBytes += int64(otx.tx.MsgTx().SerializeSize())
-	info.totalMem += int64(dynamicMemUsage(reflect.ValueOf(otx), true, 0))
+	info.totalMem += int64(dynamicMemUsage(reflect.ValueOf(otx)))
 }
 
 func (otx *orphanTx) decr(info *aggregateInfo) {
 	info.totalCount -= 1
 	info.totalBytes -= int64(otx.tx.MsgTx().SerializeSize())
-	info.totalMem -= int64(dynamicMemUsage(reflect.ValueOf(otx), false, 0))
+	info.totalMem -= int64(dynamicMemUsage(reflect.ValueOf(otx)))
 }
 
 // TxPool is used as a source of transactions that need to be mined into blocks
diff --git a/mempool/memusage.go b/mempool/memusage.go
index f6a546a0..e65ef8c2 100644
--- a/mempool/memusage.go
+++ b/mempool/memusage.go
@@ -8,7 +8,11 @@ import (
 	"reflect"
 )
 
-func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
+func dynamicMemUsage(v reflect.Value) uintptr {
+	return _dynamicMemUsage(v, false, 0)
+}
+
+func _dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
 	t := v.Type()
 	bytes := t.Size()
 	if debug {
@@ -19,7 +23,7 @@ func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
 	switch t.Kind() {
 	case reflect.Pointer, reflect.Interface:
 		if !v.IsNil() {
-			bytes += dynamicMemUsage(v.Elem(), debug, level+1)
+			bytes += _dynamicMemUsage(v.Elem(), debug, level+1)
 		}
 	case reflect.Array, reflect.Slice:
 		for j := 0; j < v.Len(); j++ {
@@ -31,10 +35,10 @@ func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
 			elemB := uintptr(0)
 			if t.Kind() == reflect.Array {
 				if (k == reflect.Pointer || k == reflect.Interface) && !vi.IsNil() {
-					elemB += dynamicMemUsage(vi.Elem(), debug, level+1)
+					elemB += _dynamicMemUsage(vi.Elem(), debug, level+1)
 				}
 			} else { // slice
-				elemB += dynamicMemUsage(vi, debug, level+1)
+				elemB += _dynamicMemUsage(vi, debug, level+1)
 			}
 			if k == reflect.Uint8 {
 				// short circuit for byte slice/array
@@ -54,11 +58,11 @@ func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
 			if debug {
 				println("[", level, "] key:", vk.Type().Kind().String())
 			}
-			bytes += dynamicMemUsage(vk, debug, level+1)
+			bytes += _dynamicMemUsage(vk, debug, level+1)
 			if debug {
 				println("[", level, "] value:", vv.Type().Kind().String())
 			}
-			bytes += dynamicMemUsage(vv, debug, level+1)
+			bytes += _dynamicMemUsage(vv, debug, level+1)
 			if debug {
 				println("...", v.Len(), "map elements")
 			}
@@ -72,10 +76,10 @@ func dynamicMemUsage(v reflect.Value, debug bool, level int) uintptr {
 				println("[", level, "] field:", f.Name, "kind:", k.String())
 			}
 			if (k == reflect.Pointer || k == reflect.Interface) && !vf.IsNil() {
-				bytes += dynamicMemUsage(vf.Elem(), debug, level+1)
+				bytes += _dynamicMemUsage(vf.Elem(), debug, level+1)
 			} else if k == reflect.Array || k == reflect.Slice {
 				bytes -= vf.Type().Size()
-				bytes += dynamicMemUsage(vf, debug, level+1)
+				bytes += _dynamicMemUsage(vf, debug, level+1)
 			}
 		}
 	}