From 820b506fe68ef13cd35485a92d0cc2ed18d4488b Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Mon, 29 Aug 2022 23:23:07 +0000 Subject: [PATCH] auction clear + test --- go.mod | 3 ++- go.sum | 4 ++++ x/cosmostest/memdb/biddb.go | 10 ++++++++++ x/cosmostest/memdb/biddb_test.go | 21 +++++++++++++++++++-- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a14e2a3..716b5ec 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( github.com/goccy/go-yaml v1.9.4 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect + github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.3 // indirect github.com/google/btree v1.0.0 // indirect @@ -86,6 +86,7 @@ require ( github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect diff --git a/go.sum b/go.sum index e8dc1a2..4f2c790 100644 --- a/go.sum +++ b/go.sum @@ -604,6 +604,8 @@ github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -733,6 +735,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 h1:lLT7ZLSzGLI08vc9cpd+tYmNWjdKDqyr/2L+f6U12Fk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= diff --git a/x/cosmostest/memdb/biddb.go b/x/cosmostest/memdb/biddb.go index 65a65be..8e573f4 100644 --- a/x/cosmostest/memdb/biddb.go +++ b/x/cosmostest/memdb/biddb.go @@ -112,3 +112,13 @@ func (b *bidDB) GetHighestBid(auctionId string) (*types.Bid, error) { return bid, err } + +func (b *bidDB) ClearAuction(auctionId string) error { + k := []byte(auctionId) + + err := b.db.Update(func(txn *badger.Txn) error { + return txn.Delete(k) + }) + + return err +} diff --git a/x/cosmostest/memdb/biddb_test.go b/x/cosmostest/memdb/biddb_test.go index 24fe7c9..fc1a673 100644 --- a/x/cosmostest/memdb/biddb_test.go +++ b/x/cosmostest/memdb/biddb_test.go @@ -3,6 +3,8 @@ package memdb import ( "cosmos-test/x/cosmostest/types" "testing" + + "github.com/dgraph-io/badger/v3" ) func TestBasicFlow(t *testing.T) { @@ -14,12 +16,12 @@ func TestBasicFlow(t *testing.T) { panic(err) } - // add a higher bid (won't check amount, though) - + // add a higher bid (db funcs won't check amount, though) if err := BidDB.AddBid("0", &types.Bid{Owner: "cosmos456", Amount: "200"}); err != nil { panic(err) } + // check highest bid if bid, err := BidDB.GetHighestBid("0"); err != nil { panic(err) } else { @@ -27,4 +29,19 @@ func TestBasicFlow(t *testing.T) { panic("Highest auction item not selected") } } + + // clear auction under id 0 + if err := BidDB.ClearAuction("0"); err != nil { + panic(err) + } else { + // expect auction key to be unknown + if err := BidDB.db.View(func(txn *badger.Txn) error { + _, err := txn.Get([]byte("0")) + return err + }); err != nil { + if err != badger.ErrKeyNotFound { + panic(err) + } + } + } }