feat(mappable,record): defining and implementing ReadMappableFromIter…

…ator generic method Signed-off-by: Deepanshu Tripathi <[email protected]>
AssetMantle · Sep 4, 2024 · 261472f · 261472f
1 parent 9ae7d22
commit 261472f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 63 deletions.
diff --git a/helpers/mappable.go b/helpers/mappable.go
@@ -5,9 +5,18 @@ package helpers
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 )
 
 type Mappable interface {
 	codec.ProtoMarshaler
 	ValidateBasic() error
 }
+
+func ReadMappableFromIterator[T Mappable](iterator sdkTypes.Iterator, mappable T) Mappable {
+	if err := mappable.Unmarshal(iterator.Value()); err != nil {
+		panic(err)
+	}
+
+	return mappable
+}
diff --git a/x/assets/record/record.go b/x/assets/record/record.go
@@ -24,15 +24,7 @@ func (record *Record) WithKey(Key helpers.Key) helpers.Record {
 	return record
 }
 func (record *Record) ReadFromIterator(iterator sdkTypes.Iterator) helpers.Record {
-	Bytes := iterator.Value()
-	if Bytes == nil {
-		return Prototype()
-	}
-
-	Mappable := record.GetMappable()
-	base.CodecPrototype().MustUnmarshal(iterator.Value(), Mappable)
-
-	return NewRecord(mappable.GetAsset(Mappable))
+	return NewRecord(mappable.GetAsset(helpers.ReadMappableFromIterator(iterator, record.GetMappable())))
 }
 func (record *Record) Read(kvStore sdkTypes.KVStore) helpers.Record {
 	if record.GetKey() == nil || len(record.GetKey().GeneratePrefixedStoreKeyBytes()) == 0 {

diff --git a/x/classifications/record/record.go b/x/classifications/record/record.go
@@ -21,15 +21,7 @@ func (record *Record) WithKey(Key helpers.Key) helpers.Record {
 	return record
 }
 func (record *Record) ReadFromIterator(iterator sdkTypes.Iterator) helpers.Record {
-	Bytes := iterator.Value()
-	if Bytes == nil {
-		return Prototype()
-	}
-
-	Mappable := record.GetMappable()
-	base.CodecPrototype().MustUnmarshal(iterator.Value(), Mappable)
-
-	return NewRecord(mappable.GetClassification(Mappable))
+	return NewRecord(mappable.GetClassification(helpers.ReadMappableFromIterator(iterator, record.GetMappable())))
 }
 func (record *Record) Read(kvStore sdkTypes.KVStore) helpers.Record {
 	if record.GetKey() == nil || len(record.GetKey().GeneratePrefixedStoreKeyBytes()) == 0 {

diff --git a/x/identities/record/record.go b/x/identities/record/record.go
@@ -22,15 +22,7 @@ func (record *Record) WithKey(Key helpers.Key) helpers.Record {
 	return record
 }
 func (record *Record) ReadFromIterator(iterator sdkTypes.Iterator) helpers.Record {
-	Bytes := iterator.Value()
-	if Bytes == nil {
-		return Prototype()
-	}
-
-	Mappable := record.GetMappable()
-	base.CodecPrototype().MustUnmarshal(iterator.Value(), Mappable)
-
-	return NewRecord(mappable.GetIdentity(Mappable))
+	return NewRecord(mappable.GetIdentity(helpers.ReadMappableFromIterator(iterator, record.GetMappable())))
 }
 func (record *Record) Read(kvStore sdkTypes.KVStore) helpers.Record {
 	if record.GetKey() == nil || len(record.GetKey().GeneratePrefixedStoreKeyBytes()) == 0 {

diff --git a/x/maintainers/record/record.go b/x/maintainers/record/record.go
@@ -28,15 +28,7 @@ func (record *Record) WithKey(Key helpers.Key) helpers.Record {
 	return record
 }
 func (record *Record) ReadFromIterator(iterator sdkTypes.Iterator) helpers.Record {
-	Bytes := iterator.Value()
-	if Bytes == nil {
-		return Prototype()
-	}
-
-	Mappable := record.GetMappable()
-	base.CodecPrototype().MustUnmarshal(iterator.Value(), Mappable)
-
-	return NewRecord(mappable.GetMaintainer(Mappable))
+	return NewRecord(mappable.GetMaintainer(helpers.ReadMappableFromIterator(iterator, record.GetMappable())))
 }
 func (record *Record) Read(kvStore sdkTypes.KVStore) helpers.Record {
 	if record.GetKey() == nil || len(record.GetKey().GeneratePrefixedStoreKeyBytes()) == 0 {

diff --git a/x/metas/record/record.go b/x/metas/record/record.go
@@ -22,15 +22,7 @@ func (record *Record) WithKey(Key helpers.Key) helpers.Record {
 	return record
 }
 func (record *Record) ReadFromIterator(iterator sdkTypes.Iterator) helpers.Record {
-	Bytes := iterator.Value()
-	if Bytes == nil {
-		return Prototype()
-	}
-
-	Mappable := record.GetMappable()
-	base.CodecPrototype().MustUnmarshal(iterator.Value(), Mappable)
-
-	return NewRecord(mappable.GetData(Mappable))
+	return NewRecord(mappable.GetData(helpers.ReadMappableFromIterator(iterator, record.GetMappable())))
 }
 func (record *Record) Read(kvStore sdkTypes.KVStore) helpers.Record {
 	if record.GetKey() == nil || len(record.GetKey().GeneratePrefixedStoreKeyBytes()) == 0 {

diff --git a/x/orders/record/record.go b/x/orders/record/record.go
@@ -22,15 +22,7 @@ func (record *Record) WithKey(Key helpers.Key) helpers.Record {
 	return record
 }
 func (record *Record) ReadFromIterator(iterator sdkTypes.Iterator) helpers.Record {
-	Bytes := iterator.Value()
-	if Bytes == nil {
-		return Prototype()
-	}
-
-	Mappable := record.GetMappable()
-	base.CodecPrototype().MustUnmarshal(iterator.Value(), Mappable)
-
-	return NewRecord(mappable.GetOrder(Mappable))
+	return NewRecord(mappable.GetOrder(helpers.ReadMappableFromIterator(iterator, record.GetMappable())))
 }
 func (record *Record) Read(kvStore sdkTypes.KVStore) helpers.Record {
 	if record.GetKey() == nil || len(record.GetKey().GeneratePrefixedStoreKeyBytes()) == 0 {

diff --git a/x/splits/record/record.go b/x/splits/record/record.go
@@ -23,15 +23,7 @@ func (record *Record) WithKey(Key helpers.Key) helpers.Record {
 	return record
 }
 func (record *Record) ReadFromIterator(iterator sdkTypes.Iterator) helpers.Record {
-	Bytes := iterator.Value()
-	if Bytes == nil {
-		return Prototype()
-	}
-
-	Mappable := record.GetMappable()
-	base.CodecPrototype().MustUnmarshal(iterator.Value(), Mappable)
-
-	return NewRecord(baseIDs.PrototypeSplitID().MustGetFromPrefixedStoreKeyBytes(record.GetKey().GenerateStorePrefixBytes(), iterator.Key()), mappable.GetSplit(Mappable))
+	return NewRecord(baseIDs.PrototypeSplitID().MustGetFromPrefixedStoreKeyBytes(record.GetKey().GenerateStorePrefixBytes(), iterator.Key()), mappable.GetSplit(helpers.ReadMappableFromIterator(iterator, record.GetMappable())))
 }
 func (record *Record) Read(kvStore sdkTypes.KVStore) helpers.Record {
 	if record.GetKey() == nil || len(record.GetKey().GeneratePrefixedStoreKeyBytes()) == 0 {