From 56d2760dc669b67ea5d018f472a5a97f77f2f7eb Mon Sep 17 00:00:00 2001
From: Hans Moog <hm@mkjc.net>
Date: Fri, 28 Jun 2019 16:42:04 +0200
Subject: [PATCH] Refactor: intermediary commit (not done)
---
packages/model/metabundle/metabundle.go | 31 ------------------
.../value_transaction/value_transaction.go | 2 +-
packages/model/valuebundle/metabundle.go | 32 +++++++++++++++++++
3 files changed, 33 insertions(+), 32 deletions(-)
delete mode 100644 packages/model/metabundle/metabundle.go
create mode 100644 packages/model/valuebundle/metabundle.go
diff --git a/packages/model/metabundle/metabundle.go b/packages/model/metabundle/metabundle.go
deleted file mode 100644
index 75a132ca..00000000
--- a/packages/model/metabundle/metabundle.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package metabundle
-
-import (
- "github.com/iotaledger/goshimmer/packages/model/meta_transaction"
- "github.com/iotaledger/goshimmer/packages/ternary"
-)
-
-type MetaBundle struct {
- hash ternary.Trytes
- transactionHashes []ternary.Trytes
-}
-
-func New(transactions []*meta_transaction.MetaTransaction) (result *MetaBundle) {
- result = &MetaBundle{
- hash: CalculateBundleHash(transactions),
- }
-
- return
-}
-
-func (bundle *MetaBundle) GetTransactionHashes() []ternary.Trytes {
-
-}
-
-func (bundle *MetaBundle) GetHash() {
-
-}
-
-func CalculateBundleHash(transactions []*meta_transaction.MetaTransaction) ternary.Trytes {
- return ternary.Trytes("A")
-}
diff --git a/packages/model/value_transaction/value_transaction.go b/packages/model/value_transaction/value_transaction.go
index 37b2bfbc..2d9b0cd8 100644
--- a/packages/model/value_transaction/value_transaction.go
+++ b/packages/model/value_transaction/value_transaction.go
@@ -37,7 +37,7 @@ func New() (result *ValueTransaction) {
func FromMetaTransaction(metaTransaction *meta_transaction.MetaTransaction) *ValueTransaction {
return &ValueTransaction{
MetaTransaction: metaTransaction,
- trits: metaTransaction.GetData(),
+ trits: metaTransaction.GetData(),
}
}
diff --git a/packages/model/valuebundle/metabundle.go b/packages/model/valuebundle/metabundle.go
new file mode 100644
index 00000000..18d78f6a
--- /dev/null
+++ b/packages/model/valuebundle/metabundle.go
@@ -0,0 +1,32 @@
+package valuebundle
+
+import (
+ "github.com/iotaledger/goshimmer/packages/model/value_transaction"
+ "github.com/iotaledger/goshimmer/packages/ternary"
+)
+
+type MetaBundle struct {
+ hash ternary.Trytes
+ transactionHashes []ternary.Trytes
+}
+
+func New(transactions []*value_transaction.ValueTransaction) (result *MetaBundle) {
+ result = &MetaBundle{
+ hash: CalculateBundleHash(transactions),
+ }
+
+ return
+}
+
+func (bundle *MetaBundle) GetTransactionHashes() []ternary.Trytes {
+ return bundle.transactionHashes
+}
+
+func (bundle *MetaBundle) GetHash() ternary.Trytes {
+ return bundle.hash
+}
+
+func CalculateBundleHash(transactions []*value_transaction.ValueTransaction) ternary.Trytes {
+ //transactions[0].GetData()[value_transaction.SIGNATURE_MESSAGE_FRAGMENT_OFFSET]
+ return ternary.Trytes("A")
+}
--
GitLab