Merge branch 'staging' into VDB-101-vat-fold-transformer

This commit is contained in:
David Terry
2018-10-09 14:15:07 +03:00
10 changed files with 49 additions and 29 deletions
+4 -2
View File
@@ -42,6 +42,8 @@ var (
biteRawString = string(biteRawJson)
biteIlk = [32]byte{102, 97, 107, 101, 32, 105, 108, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
biteLad = [32]byte{102, 97, 107, 101, 32, 108, 97, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
biteIlkString = "0x66616b6520696c6B000000000000000000000000"
biteLadString = "0x66616B65206c6164000000000000000000000000"
biteId = int64(1)
)
@@ -76,8 +78,8 @@ var BiteEntity = bite.BiteEntity{
var BiteModel = bite.BiteModel{
Id: strconv.FormatInt(biteId, 10),
Ilk: biteIlk[:],
Urn: biteLad[:],
Ilk: biteIlkString,
Urn: biteLadString,
Ink: biteInk.String(),
Art: biteArt.String(),
Tab: biteTab.String(),
+12 -10
View File
@@ -33,14 +33,16 @@ var (
var (
// need to set bytes as 0 or else the big Int 0 evaluates differently from the one unpacked by the abi
art = big.NewInt(20)
dink = big.NewInt(10)
dart = big.NewInt(0).SetBytes([]byte{0})
iArt = big.NewInt(25)
frobLad = [32]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 217, 34, 137, 65, 83, 190, 158, 239, 123, 114, 24, 220, 86, 93, 29, 12, 226, 160, 146}
gem, _ = big.NewInt(0).SetString("115792089237316195423570985008687907853269984665640564039457584007913129639926", 10)
ink = big.NewInt(15)
ilk = [32]byte{102, 97, 107, 101, 32, 105, 108, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
art = big.NewInt(20)
dink = big.NewInt(10)
dart = big.NewInt(0).SetBytes([]byte{0})
iArt = big.NewInt(25)
frobLad = [32]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 217, 34, 137, 65, 83, 190, 158, 239, 123, 114, 24, 220, 86, 93, 29, 12, 226, 160, 146}
gem, _ = big.NewInt(0).SetString("115792089237316195423570985008687907853269984665640564039457584007913129639926", 10)
ink = big.NewInt(15)
ilk = [32]byte{102, 97, 107, 101, 32, 105, 108, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
frobIlkString = "0x66616b6520696c6B000000000000000000000000"
frobUrnString = "0x00000000000000000000000064D922894153BE9E"
)
var EthFrobLog = types.Log{
@@ -73,8 +75,8 @@ var FrobEntity = frob.FrobEntity{
var rawFrobLog, _ = json.Marshal(EthFrobLog)
var FrobModel = frob.FrobModel{
Ilk: ilk[:],
Urn: frobLad[:],
Ilk: frobIlkString,
Urn: frobUrnString,
Ink: ink.String(),
Art: art.String(),
Dink: dink.String(),