summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeph Grunschlag <zeph@algorand.com>2022-07-31 21:46:47 -0500
committerZeph Grunschlag <zeph@algorand.com>2022-07-31 21:46:47 -0500
commit067125d276cb646022e535b434a579d89c9d7baa (patch)
treecb15729d6ca763332948257691b92d75849043ac
parent9f7b9ec5a7b5440c83681a381d5674009fabe161 (diff)
interface related errorstzaffi/indexer-box-e2e
-rw-r--r--data/transactions/logic/eval.go1
-rw-r--r--data/transactions/logic/evalStateful_test.go4
-rw-r--r--data/transactions/logic/eval_test.go1
-rw-r--r--ledger/internal/applications.go26
4 files changed, 17 insertions, 15 deletions
diff --git a/data/transactions/logic/eval.go b/data/transactions/logic/eval.go
index 2ce22b9a4..0d7bad99f 100644
--- a/data/transactions/logic/eval.go
+++ b/data/transactions/logic/eval.go
@@ -200,7 +200,6 @@ type LedgerForLogic interface {
AccountData(addr basics.Address) (ledgercore.AccountData, error)
Authorizer(addr basics.Address) (basics.Address, error)
Round() basics.Round
- LatestTimestamp() int64
BlockHdrCached(basics.Round) (bookkeeping.BlockHeader, error)
PrevTimestamp() int64
diff --git a/data/transactions/logic/evalStateful_test.go b/data/transactions/logic/evalStateful_test.go
index a5fa69b8f..22e916764 100644
--- a/data/transactions/logic/evalStateful_test.go
+++ b/data/transactions/logic/evalStateful_test.go
@@ -2545,8 +2545,8 @@ func TestBlockSeed(t *testing.T) {
// in l. Nothing in most tests cares. But the rule for `block` is
// related to lv and the current round, so we set the fv,lv more
// realistically.
- txn.FirstValid = l.round() - 10
- txn.LastValid = l.round() + 10
+ txn.FirstValid = l.Round() - 10
+ txn.LastValid = l.Round() + 10
// l.round() is 0xffffffff+5 = 4294967300 in test ledger
testApp(t, "int 4294967299; block BlkSeed; len; int 32; ==", ep) // current - 1
diff --git a/data/transactions/logic/eval_test.go b/data/transactions/logic/eval_test.go
index 0e6381587..0b8996797 100644
--- a/data/transactions/logic/eval_test.go
+++ b/data/transactions/logic/eval_test.go
@@ -140,7 +140,6 @@ func defaultEvalParamsWithVersion(version uint64, txns ...transactions.SignedTxn
if empty {
// We made an app type in order to get a full ep, but that sets MinTealVersion=2
ep.TxnGroup[0].Txn.Type = "" // set it back
- ep.MinTealVersion = nil // will recalculate in eval()
}
return ep
}
diff --git a/ledger/internal/applications.go b/ledger/internal/applications.go
index 0af644f7b..99b332f35 100644
--- a/ledger/internal/applications.go
+++ b/ledger/internal/applications.go
@@ -142,20 +142,24 @@ func (cs *roundCowState) AppParams(appIdx basics.AppIndex) (basics.AppParams, ba
return params, creator, nil
}
-func (al *logicLedger) Round() basics.Round {
- return al.cow.round()
-}
+// func (al *logicLedger) Round() basics.Round {
+// return al.cow.round()
+// }
-func (al *logicLedger) LatestTimestamp() int64 {
- return al.cow.prevTimestamp()
-}
+// func (al *logicLedger) LatestTimestamp() int64 {
+// return al.cow.prevTimestamp()
+// }
-func (al *logicLedger) BlockHdrCached(round basics.Round) (bookkeeping.BlockHeader, error) {
- return al.cow.blockHdrCached(round)
-}
+// func (al *logicLedger) OptedIn(addr basics.Address, appIdx basics.AppIndex) (bool, error) {
+// return al.cow.allocated(addr, appIdx, false)
+// }
+
+// func (al *logicLedger) BlockHdrCached(round basics.Round) (bookkeeping.BlockHeader, error) {
+// return al.cow.blockHdrCached(round)
+// }
-func (al *logicLedger) OptedIn(addr basics.Address, appIdx basics.AppIndex) (bool, error) {
- return al.cow.allocated(addr, appIdx, false)
+func (cs *roundCowState) BlockHdrCached(round basics.Round) (bookkeeping.BlockHeader, error) {
+ return cs.blockHdrCached(round)
}
func (cs *roundCowState) OptedIn(addr basics.Address, appIdx basics.AppIndex) (bool, error) {