Merge pull request #735 from dessaya/remove-deps

Remove some bloat

Author: dessaya

go.mod

@@ -13,12 +13,9 @@ require (
 	filippo.io/edwards25519 v1.1.0
 	fortio.org/safecast v1.0.0
 	github.com/VictoriaMetrics/fastcache v1.12.2
-	github.com/Yiling-J/theine-go v0.6.1
 	github.com/btcsuite/btcd/btcutil v1.1.6
 	github.com/bygui86/multi-profile/v2 v2.1.0
 	github.com/coder/websocket v1.8.13
-	github.com/dgraph-io/ristretto v0.2.0
-	github.com/dgryski/go-clockpro v0.0.0-20140817124034-edc6d3eeb96e
 	github.com/dustin/go-humanize v1.0.1
 	github.com/ethereum/go-ethereum v1.15.5
 	github.com/golang-jwt/jwt/v5 v5.2.2
@@ -52,15 +49,13 @@ require (
 	github.com/mitchellh/hashstructure/v2 v2.0.2
 	github.com/multiformats/go-multiaddr v0.16.0
 	github.com/pangpanglabs/echoswagger/v2 v2.4.1
-	github.com/pingcap/go-ycsb v1.0.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.22.0
 	github.com/samber/lo v1.49.1
 	github.com/samber/slog-zap/v2 v2.6.2
 	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0
 	github.com/testcontainers/testcontainers-go v0.35.0
-	github.com/tidwall/gjson v1.18.0
 	github.com/tyler-smith/go-bip39 v1.1.0
 	github.com/wollac/iota-crypto-demo v0.0.0-20221117162917-b10619eccb98
 	github.com/zondax/hid v0.9.2
@@ -188,7 +183,6 @@ require (
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/petermattis/goid v0.0.0-20250303134427-723919f7f203 // indirect
-	github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
 	github.com/pion/datachannel v1.5.10 // indirect
 	github.com/pion/dtls/v2 v2.2.12 // indirect
 	github.com/pion/dtls/v3 v3.0.6 // indirect
@@ -229,15 +223,12 @@ require (
 	github.com/supranational/blst v0.3.14 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.15 // indirect
 	github.com/tklauser/numcpus v0.10.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	github.com/zeebo/xxh3 v1.0.2 // indirect
 	go.dedis.ch/fixbuf v1.0.3 // indirect
 	go.dedis.ch/protobuf v1.0.11 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect

go.sum

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/tidwall/gjson"
-
 	"github.com/iotaledger/wasp/v2/clients/iota-go/iotago"
 	"github.com/iotaledger/wasp/v2/clients/iota-go/iotago/iotatest"
 	"github.com/iotaledger/wasp/v2/clients/iota-go/iotajsonrpc"
@@ -22,7 +20,7 @@ type EstimationRequest struct {
 	GasBudget    json.Number
 }
 
-func DecodeCreateAndSendRequest(msg *EstimationRequest, cmd iotago.ProgrammableMoveCall, inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput) error {
+func DecodeCreateAndSendRequest(msg *EstimationRequest, cmd *iotago.ProgrammableMoveCall, inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput) error {
 	if len(cmd.Arguments) != 7 {
 		return errors.New("create_and_send_request has invalid parameters")
 	}
@@ -60,7 +58,7 @@ func DecodeCreateAndSendRequest(msg *EstimationRequest, cmd iotago.ProgrammableM
 	return nil
 }
 
-func DecodeCoin(assets *Assets, cmd iotago.ProgrammableMoveCall, inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput) error {
+func DecodeCoin(assets *Assets, cmd *iotago.ProgrammableMoveCall, inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput) error {
 	var err error
 	if len(cmd.Arguments) != 2 {
 		return fmt.Errorf("malformed PTB")
@@ -82,7 +80,7 @@ func DecodeCoin(assets *Assets, cmd iotago.ProgrammableMoveCall, inputs []iotajs
 	return nil
 }
 
-func DecodeAsset(assets *Assets, cmd iotago.ProgrammableMoveCall, inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput) error {
+func DecodeAsset(assets *Assets, cmd *iotago.ProgrammableMoveCall, inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput) error {
 	var err error
 	if len(cmd.Arguments) != 2 {
 		return fmt.Errorf("malformed PTB")
@@ -114,74 +112,56 @@ func DecodeAsset(assets *Assets, cmd iotago.ProgrammableMoveCall, inputs []iotaj
 // I don't expect it to change often if ever, so that seems to be a straight forward way.
 func DecodeDryRunTransaction(dryRunRes *iotajsonrpc.DryRunTransactionBlockResponse) (*Assets, *EstimationRequest, *cryptolib.Address, error) {
 	tx := dryRunRes.Input.Data.V1.Transaction.Data.ProgrammableTransaction
-	cmds := gjson.ParseBytes(tx.Commands)
-	var err error
+
+	var cmds []struct {
+		MoveCall *iotago.ProgrammableMoveCall `json:"MoveCall,omitempty"`
+	}
+	if err := json.Unmarshal(tx.Commands, &cmds); err != nil {
+		return nil, nil, cryptolib.NewEmptyAddress(), fmt.Errorf("can't decode dry run response: %w", err)
+	}
 
 	assets := NewAssets(0)
 	request := &EstimationRequest{
 		Message: iscmove.Message{},
 	}
 
-	cmds.ForEach(func(key, value gjson.Result) bool {
-		if moveCall := value.Get("MoveCall"); moveCall.Exists() {
-			var cmd iotago.ProgrammableMoveCall
-			err = json.Unmarshal([]byte(moveCall.String()), &cmd)
-			if err != nil {
-				err = fmt.Errorf("can't decode dry run response: %w", err)
-				return false
-			}
-
+	for _, moveCall := range cmds {
+		if cmd := moveCall.MoveCall; cmd != nil {
 			// take all placed coins into assets
 			if cmd.Function == "place_coin" {
 				var inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput
-				err = json.Unmarshal(tx.Inputs, &inputs)
-				if err != nil {
-					err = fmt.Errorf("can't decode place_coin command: %w", err)
-					return false
+				if err := json.Unmarshal(tx.Inputs, &inputs); err != nil {
+					return nil, nil, cryptolib.NewEmptyAddress(), fmt.Errorf("can't decode place_coin command: %w", err)
 				}
 
-				err = DecodeCoin(assets, cmd, inputs)
-				if err != nil {
-					err = fmt.Errorf("can't decode place_coin command: %w", err)
-					return false
+				if err := DecodeCoin(assets, cmd, inputs); err != nil {
+					return nil, nil, cryptolib.NewEmptyAddress(), fmt.Errorf("can't decode place_coin command: %w", err)
 				}
 			}
 
 			if cmd.Function == "place_asset" {
 				var inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput
-				err = json.Unmarshal(tx.Inputs, &inputs)
-				if err != nil {
-					err = fmt.Errorf("can't decode place_asset command: %w", err)
-					return false
+				if err := json.Unmarshal(tx.Inputs, &inputs); err != nil {
+					return nil, nil, cryptolib.NewEmptyAddress(), fmt.Errorf("can't decode place_asset command: %w", err)
 				}
 
-				err = DecodeAsset(assets, cmd, inputs)
-				if err != nil {
-					err = fmt.Errorf("can't decode place_asset command: %w", err)
-					return false
+				if err := DecodeAsset(assets, cmd, inputs); err != nil {
+					return nil, nil, cryptolib.NewEmptyAddress(), fmt.Errorf("can't decode place_asset command: %w", err)
 				}
 			}
 
 			if cmd.Function == "create_and_send_request" {
 				var inputs []iotajsonrpc.ProgrammableTransactionBlockPureInput
-				err = json.Unmarshal(tx.Inputs, &inputs)
-				if err != nil {
-					err = fmt.Errorf("can't decode create_and_send_request command: %w", err)
-					return false
+				if err := json.Unmarshal(tx.Inputs, &inputs); err != nil {
+					return nil, nil, cryptolib.NewEmptyAddress(), fmt.Errorf("can't decode create_and_send_request command: %w", err)
 				}
 
-				err = DecodeCreateAndSendRequest(request, cmd, inputs)
-				if err != nil {
-					err = fmt.Errorf("can't decode create_and_send_request command: %w", err)
-					return false
+				if err := DecodeCreateAndSendRequest(request, cmd, inputs); err != nil {
+					return nil, nil, cryptolib.NewEmptyAddress(), fmt.Errorf("can't decode create_and_send_request command: %w", err)
 				}
 			}
 		}
-		return true // Continue iteration
-	})
-	if err != nil {
-		return nil, nil, cryptolib.NewEmptyAddress(), err
 	}
 
-	return assets, request, cryptolib.NewAddressFromIota(&dryRunRes.Input.Data.V1.Sender), err
+	return assets, request, cryptolib.NewAddressFromIota(&dryRunRes.Input.Data.V1.Sender), nil
 }

go.work.sum

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"io"
 	"math/rand/v2"
+	"strconv"
 	"testing"
 
 	"github.com/samber/lo"
@@ -13,6 +14,20 @@ import (
 	"github.com/iotaledger/wasp/v2/packages/trie"
 )
 
+type valueMaker struct {
+	z *rand.Zipf
+}
+
+func newValueMaker() *valueMaker {
+	return &valueMaker{
+		z: rand.NewZipf(rand.New(rand.NewChaCha8([32]byte{})), 1.1, 1, 1000),
+	}
+}
+
+func (g *valueMaker) Next() string {
+	return strconv.FormatUint(g.z.Uint64(), 10)
+}
+
 func keyMaker() func() []byte {
 	// small alphabet to force keys to have common prefixes
 	const alphabet = "abc"
@@ -33,7 +48,7 @@ func makeTrie(n int) (*InMemoryKVStore, []trie.Hash) {
 	store := NewInMemoryKVStore()
 	roots := []trie.Hash{lo.Must(trie.NewTrieRW(store).InitRoot(true))}
 	makeKey := keyMaker()
-	values := NewScrambledZipfian(1000, 0)
+	values := newValueMaker()
 
 	for range n {
 		tr := lo.Must(trie.NewDraft(store, roots[len(roots)-1]))
@@ -58,8 +73,8 @@ func BenchmarkTakeSnapshot(b *testing.B) {
 	store, roots := makeTrie(1)
 	r := trie.NewTrieRFromRoot(store, roots[len(roots)-1])
 	store.ResetStats()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+
+	for b.Loop() {
 		err := r.TakeSnapshot(io.Discard)
 		require.NoError(b, err)
 	}
@@ -74,7 +89,6 @@ func BenchmarkRestoreSnapshot(b *testing.B) {
 	//   56646487 ns/op    13083 kvs/op     7443 reads/op    27590744 B/op    386339 allocs/op
 	// reads/op measures the amount of times the DB is called to fetch data (which is the bottleneck when using RocksDB)
 
-	b.StopTimer()
 	buf := bytes.NewBuffer(nil)
 	{
 		store, roots := makeTrie(1)
@@ -84,7 +98,7 @@ func BenchmarkRestoreSnapshot(b *testing.B) {
 	}
 
 	stats := InMemoryKVStoreStats{}
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		newStore := NewInMemoryKVStore()
 		newStore.Stats = stats
 		b.StartTimer()
@@ -104,11 +118,10 @@ func BenchmarkPrune(b *testing.B) {
 	//   24594662 ns/op    16476 kvs/op     9132 reads/op    19913272 B/op    307635 allocs/op
 	// reads/op measures the amount of times the DB is called to fetch data (which is the bottleneck when using RocksDB)
 
-	b.StopTimer()
 	store, roots := makeTrie(3)
 	penultimateRoot := roots[len(roots)-2]
 	stats := InMemoryKVStoreStats{}
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		storeClone := NewInMemoryKVStore()
 		lo.Must0(kvstore.Copy(store.m, storeClone.m))
 		storeClone.Stats = stats
@@ -129,16 +142,14 @@ func BenchmarkCommit(b *testing.B) {
 	//    9486585 ns/op   4221 kvs/op      2 reads/op   6279097 B/op   108977 allocs/op
 	// reads/op measures the amount of times the DB is called to fetch data (which is the bottleneck when using RocksDB)
 
-	b.StopTimer()
-
 	store := NewInMemoryKVStore()
 	stats := store.Stats
 
 	makeKey := keyMaker()
-	values := NewScrambledZipfian(1000, 0)
+	values := newValueMaker()
 
 	root := lo.Must(trie.NewTrieRW(store).InitRoot(true))
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		tr := lo.Must(trie.NewDraft(store, root))
 		for range 1000 {
 			key := makeKey()