diff --git a/packages/ledgerstate/ledgerstate.go b/packages/ledgerstate/ledgerstate.go index 654c606790c134641dc790486387177a36d4b0d1..259c5a70f400a3602d86c2607f7cc221b5875638 100644 --- a/packages/ledgerstate/ledgerstate.go +++ b/packages/ledgerstate/ledgerstate.go @@ -7,15 +7,11 @@ import ( "strings" "time" + "github.com/iotaledger/goshimmer/packages/binary/address" + "github.com/iotaledger/goshimmer/packages/binary/transfer" "github.com/iotaledger/goshimmer/packages/ledgerstate/conflict" - "github.com/iotaledger/goshimmer/packages/ledgerstate/reality" - - "github.com/iotaledger/goshimmer/packages/binary/transfer" - - "github.com/iotaledger/goshimmer/packages/binary/transferoutput" - - "github.com/iotaledger/goshimmer/packages/binary/address" + "github.com/iotaledger/goshimmer/packages/ledgerstate/transferoutput" "github.com/iotaledger/goshimmer/packages/graphviz" diff --git a/packages/ledgerstate/ledgerstate_test.go b/packages/ledgerstate/ledgerstate_test.go index 1aa8176cf2a02afe34b7f3d33acff23f1251df0e..cd98470d1dd549b3a755d9890f225ad83d72690d 100644 --- a/packages/ledgerstate/ledgerstate_test.go +++ b/packages/ledgerstate/ledgerstate_test.go @@ -6,13 +6,10 @@ import ( "testing" "time" - "github.com/iotaledger/goshimmer/packages/binary/transferoutput" - - "github.com/iotaledger/goshimmer/packages/ledgerstate/reality" - - "github.com/iotaledger/goshimmer/packages/binary/transfer" - "github.com/iotaledger/goshimmer/packages/binary/address" + "github.com/iotaledger/goshimmer/packages/binary/transfer" + "github.com/iotaledger/goshimmer/packages/ledgerstate/reality" + "github.com/iotaledger/goshimmer/packages/ledgerstate/transferoutput" "github.com/iotaledger/hive.go/objectstorage" "github.com/iotaledger/hive.go/parameter" diff --git a/packages/ledgerstate/outputs.png b/packages/ledgerstate/outputs.png index fbc282cfbfb8ee744230710f46f058f8ff961ccd..9be1a9e21d8b159c383ce6444bd82fd207269d20 100644 Binary files a/packages/ledgerstate/outputs.png and b/packages/ledgerstate/outputs.png differ diff --git a/packages/ledgerstate/outputs1.png b/packages/ledgerstate/outputs1.png index b695948cae29c186c1eb156ee1b0a736ab1045f6..32cba365ac6243874aec87794a9b37f383187ff7 100644 Binary files a/packages/ledgerstate/outputs1.png and b/packages/ledgerstate/outputs1.png differ diff --git a/packages/ledgerstate/outputs2.png b/packages/ledgerstate/outputs2.png index 318df0d060ce04472b94f808926808a091490fe0..82e1a1e88f362a29156c40d5fa07723bcc060a62 100644 Binary files a/packages/ledgerstate/outputs2.png and b/packages/ledgerstate/outputs2.png differ diff --git a/packages/ledgerstate/reality.go b/packages/ledgerstate/reality.go index 5265815a2a28059f2c32dd81ff78a29cc39ec982..878b5453bbcfeb261215dfed63e756dcec4f8a10 100644 --- a/packages/ledgerstate/reality.go +++ b/packages/ledgerstate/reality.go @@ -4,20 +4,15 @@ import ( "sync" "sync/atomic" - "github.com/iotaledger/goshimmer/packages/ledgerstate/conflict" - + "github.com/iotaledger/goshimmer/packages/binary/address" + "github.com/iotaledger/goshimmer/packages/binary/transfer" "github.com/iotaledger/goshimmer/packages/binary/types" - + "github.com/iotaledger/goshimmer/packages/errors" + "github.com/iotaledger/goshimmer/packages/ledgerstate/conflict" "github.com/iotaledger/goshimmer/packages/ledgerstate/reality" - - "github.com/iotaledger/goshimmer/packages/binary/transfer" - "github.com/iotaledger/goshimmer/packages/binary/transferoutput" - - "github.com/iotaledger/goshimmer/packages/binary/address" - + "github.com/iotaledger/goshimmer/packages/ledgerstate/transferoutput" "github.com/iotaledger/goshimmer/packages/stringify" - "github.com/iotaledger/goshimmer/packages/errors" "github.com/iotaledger/hive.go/objectstorage" ) diff --git a/packages/ledgerstate/transfer.go b/packages/ledgerstate/transfer.go index d5ade36c08fb2f1a3f068e235e676293e089763a..9b3667979c0767a94dff9dee5d7fd252e242a99b 100644 --- a/packages/ledgerstate/transfer.go +++ b/packages/ledgerstate/transfer.go @@ -3,7 +3,7 @@ package ledgerstate import ( "github.com/iotaledger/goshimmer/packages/binary/address" "github.com/iotaledger/goshimmer/packages/binary/transfer" - "github.com/iotaledger/goshimmer/packages/binary/transferoutput" + "github.com/iotaledger/goshimmer/packages/ledgerstate/transferoutput" ) type Transfer struct { diff --git a/packages/ledgerstate/transfer_hash.go b/packages/ledgerstate/transfer_hash.go deleted file mode 100644 index 35093ba49055b0d2ecd0e6c413d16d5b01c9d431..0000000000000000000000000000000000000000 --- a/packages/ledgerstate/transfer_hash.go +++ /dev/null @@ -1,33 +0,0 @@ -package ledgerstate - -/* -type TransferHash [transferHashLength]byte - -func NewTransferHash(transferHash string) (result TransferHash) { - copy(result[:], transferHash) - - return -} - -func (transferHash TransferHash) ToRealityId() (realityId RealityId) { - copy(realityId[:], transferHash[:]) - - return -} - -func (transferHash *TransferHash) UnmarshalBinary(data []byte) error { - copy(transferHash[:], data[:transferHashLength]) - - return nil -} - -func (transferHash TransferHash) String() string { - if utf8.Valid(transferHash[:]) { - return string(transferHash[:]) - } else { - return stringify.SliceOfBytes(transferHash[:]) - } -} - -const transferHashLength = 32 -*/ diff --git a/packages/binary/transferoutput/reference.go b/packages/ledgerstate/transferoutput/reference.go similarity index 100% rename from packages/binary/transferoutput/reference.go rename to packages/ledgerstate/transferoutput/reference.go diff --git a/packages/ledgerstate/visualizer.go b/packages/ledgerstate/visualizer.go index 14e09a925853ee353b67c3cbb19cabc2cd2bea36..422004e3cc1a7d0dada8ea0cfa48694c8473fd2e 100644 --- a/packages/ledgerstate/visualizer.go +++ b/packages/ledgerstate/visualizer.go @@ -3,14 +3,11 @@ package ledgerstate import ( "strings" - "github.com/iotaledger/goshimmer/packages/ledgerstate/reality" - - "github.com/iotaledger/goshimmer/packages/binary/transfer" - "github.com/iotaledger/goshimmer/packages/binary/address" - "github.com/iotaledger/goshimmer/packages/binary/transferoutput" - + "github.com/iotaledger/goshimmer/packages/binary/transfer" "github.com/iotaledger/goshimmer/packages/graphviz" + "github.com/iotaledger/goshimmer/packages/ledgerstate/reality" + "github.com/iotaledger/goshimmer/packages/ledgerstate/transferoutput" "github.com/emicklei/dot" "github.com/iotaledger/hive.go/objectstorage"