From c5074d92b7b7ef8ac21aed7f2793cf0a54e161dc Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Wed, 27 Apr 2016 19:38:19 -0400
Subject: [PATCH] fix up state and tx tests
---
state/permissions_test.go | 25 +++++++++++++++----------
txs/tx_test.go | 23 +++++++++--------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/state/permissions_test.go b/state/permissions_test.go
index 9e3f3685..0651c3c8 100644
--- a/state/permissions_test.go
+++ b/state/permissions_test.go
@@ -24,6 +24,11 @@ func init() {
tendermint_test.ResetConfig("permissions_test")
}
+var (
+ dbBackend = "memdb"
+ dbDir = ""
+)
+
/*
Permission Tests:
@@ -136,7 +141,7 @@ func newBaseGenDoc(globalPerm, accountPerm ptypes.AccountPermissions) GenesisDoc
}
func TestSendFails(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[1].Permissions.Base.Set(ptypes.Send, true)
genDoc.Accounts[2].Permissions.Base.Set(ptypes.Call, true)
@@ -204,7 +209,7 @@ func TestSendFails(t *testing.T) {
}
func TestName(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[0].Permissions.Base.Set(ptypes.Send, true)
genDoc.Accounts[1].Permissions.Base.Set(ptypes.Name, true)
@@ -238,7 +243,7 @@ func TestName(t *testing.T) {
}
func TestCallFails(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[1].Permissions.Base.Set(ptypes.Send, true)
genDoc.Accounts[2].Permissions.Base.Set(ptypes.Call, true)
@@ -308,7 +313,7 @@ func TestCallFails(t *testing.T) {
}
func TestSendPermission(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[0].Permissions.Base.Set(ptypes.Send, true) // give the 0 account permission
st := MakeGenesisState(stateDB, &genDoc)
@@ -344,7 +349,7 @@ func TestSendPermission(t *testing.T) {
}
func TestCallPermission(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[0].Permissions.Base.Set(ptypes.Call, true) // give the 0 account permission
st := MakeGenesisState(stateDB, &genDoc)
@@ -466,7 +471,7 @@ func TestCallPermission(t *testing.T) {
}
func TestCreatePermission(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[0].Permissions.Base.Set(ptypes.CreateContract, true) // give the 0 account permission
genDoc.Accounts[0].Permissions.Base.Set(ptypes.Call, true) // give the 0 account permission
@@ -584,7 +589,7 @@ func TestCreatePermission(t *testing.T) {
/* TODO
func TestBondPermission(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state",dbBackend,dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
st := MakeGenesisState(stateDB, &genDoc)
blockCache := NewBlockCache(st)
@@ -708,7 +713,7 @@ func TestBondPermission(t *testing.T) {
*/
func TestCreateAccountPermission(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[0].Permissions.Base.Set(ptypes.Send, true) // give the 0 account permission
genDoc.Accounts[1].Permissions.Base.Set(ptypes.Send, true) // give the 0 account permission
@@ -851,7 +856,7 @@ func TestCreateAccountPermission(t *testing.T) {
var DougAddress = append([]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, []byte("THISISDOUG")...)
func TestSNativeCALL(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[0].Permissions.Base.Set(ptypes.Call, true) // give the 0 account permission
genDoc.Accounts[3].Permissions.Base.Set(ptypes.Bond, true) // some arbitrary permission to play with
@@ -985,7 +990,7 @@ func TestSNativeCALL(t *testing.T) {
}
func TestSNativeTx(t *testing.T) {
- stateDB := dbm.GetDB("state")
+ stateDB := dbm.GetDB("state", dbBackend, dbDir)
genDoc := newBaseGenDoc(PermsAllFalse, PermsAllFalse)
genDoc.Accounts[0].Permissions.Base.Set(ptypes.Call, true) // give the 0 account permission
genDoc.Accounts[3].Permissions.Base.Set(ptypes.Bond, true) // some arbitrary permission to play with
diff --git a/txs/tx_test.go b/txs/tx_test.go
index 734850da..4e984fc3 100644
--- a/txs/tx_test.go
+++ b/txs/tx_test.go
@@ -7,15 +7,9 @@ import (
ptypes "github.com/eris-ltd/eris-db/permission/types"
. "github.com/tendermint/go-common"
"github.com/tendermint/go-crypto"
- "github.com/tendermint/tendermint/config/tendermint_test"
)
-var chainID string
-
-func init() {
- tendermint_test.ResetConfig("txs_test")
- chainID = config.GetString("erisdb.chain_id")
-}
+var chainID = "myChainID"
func TestSendTxSignable(t *testing.T) {
sendTx := &SendTx{
@@ -45,7 +39,8 @@ func TestSendTxSignable(t *testing.T) {
signBytes := acm.SignBytes(chainID, sendTx)
signStr := string(signBytes)
expected := Fmt(`{"chain_id":"%s","tx":[1,{"inputs":[{"address":"696E70757431","amount":12345,"sequence":67890},{"address":"696E70757432","amount":111,"sequence":222}],"outputs":[{"address":"6F757470757431","amount":333},{"address":"6F757470757432","amount":444}]}]}`,
- config.GetString("erisdb.chain_id"))
+ chainID)
+
if signStr != expected {
t.Errorf("Got unexpected sign string for SendTx. Expected:\n%v\nGot:\n%v", expected, signStr)
}
@@ -66,7 +61,7 @@ func TestCallTxSignable(t *testing.T) {
signBytes := acm.SignBytes(chainID, callTx)
signStr := string(signBytes)
expected := Fmt(`{"chain_id":"%s","tx":[2,{"address":"636F6E747261637431","data":"6461746131","fee":222,"gas_limit":111,"input":{"address":"696E70757431","amount":12345,"sequence":67890}}]}`,
- config.GetString("erisdb.chain_id"))
+ chainID)
if signStr != expected {
t.Errorf("Got unexpected sign string for CallTx. Expected:\n%v\nGot:\n%v", expected, signStr)
}
@@ -86,7 +81,7 @@ func TestNameTxSignable(t *testing.T) {
signBytes := acm.SignBytes(chainID, nameTx)
signStr := string(signBytes)
expected := Fmt(`{"chain_id":"%s","tx":[3,{"data":"secretly.not.google.com","fee":1000,"input":{"address":"696E70757431","amount":12345,"sequence":250},"name":"google.com"}]}`,
- config.GetString("erisdb.chain_id"))
+ chainID)
if signStr != expected {
t.Errorf("Got unexpected sign string for CallTx. Expected:\n%v\nGot:\n%v", expected, signStr)
}
@@ -123,7 +118,7 @@ func TestBondTxSignable(t *testing.T) {
signBytes := acm.SignBytes(chainID, bondTx)
signStr := string(signBytes)
expected := Fmt(`{"chain_id":"%s","tx":[17,{"inputs":[{"address":"696E70757431","amount":12345,"sequence":67890},{"address":"696E70757432","amount":111,"sequence":222}],"pub_key":"3B6A27BCCEB6A42D62A3A8D02A6F0D73653215771DE243A63AC048A18B59DA29","unbond_to":[{"address":"6F757470757431","amount":333},{"address":"6F757470757432","amount":444}]}]}`,
- config.GetString("erisdb.chain_id"))
+ chainID)
if signStr != expected {
t.Errorf("Unexpected sign string for BondTx. \nGot %s\nExpected %s", signStr, expected)
}
@@ -137,7 +132,7 @@ func TestUnbondTxSignable(t *testing.T) {
signBytes := acm.SignBytes(chainID, unbondTx)
signStr := string(signBytes)
expected := Fmt(`{"chain_id":"%s","tx":[18,{"address":"6164647265737331","height":111}]}`,
- config.GetString("erisdb.chain_id"))
+ chainID)
if signStr != expected {
t.Errorf("Got unexpected sign string for UnbondTx")
}
@@ -151,7 +146,7 @@ func TestRebondTxSignable(t *testing.T) {
signBytes := acm.SignBytes(chainID, rebondTx)
signStr := string(signBytes)
expected := Fmt(`{"chain_id":"%s","tx":[19,{"address":"6164647265737331","height":111}]}`,
- config.GetString("erisdb.chain_id"))
+ chainID)
if signStr != expected {
t.Errorf("Got unexpected sign string for RebondTx")
}
@@ -174,7 +169,7 @@ func TestPermissionsTxSignable(t *testing.T) {
signBytes := acm.SignBytes(chainID, permsTx)
signStr := string(signBytes)
expected := Fmt(`{"chain_id":"%s","tx":[32,{"args":"[2,{"address":"6164647265737331","permission":1,"value":true}]","input":{"address":"696E70757431","amount":12345,"sequence":250}}]}`,
- config.GetString("erisdb.chain_id"))
+ chainID)
if signStr != expected {
t.Errorf("Got unexpected sign string for PermsTx. Expected:\n%v\nGot:\n%v", expected, signStr)
}
--
GitLab