7 Commits

Author	SHA1	Message	Date
kumavis	2198276bd5	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-06-06 12:05:38 -07:00
Csaba Solya	6affd8f949	adding transaction controller tests	2018-05-30 16:24:40 +02:00
kumavis	32293a959c	test - unit - tx-controller - fix blockTracker stub	2018-05-29 01:08:55 -07:00
kumavis	5be154ea20	controllers - transactions - merge @frankiebee's work with mine	2018-05-28 14:29:31 -07:00
kumavis	afdefc58e9	test - unit - tx-controller-test - add history object to txMeta when using internal calls	2018-05-24 22:41:09 -07:00
tmashuang	238f2eb179	Merge branch 'develop' into testing	2018-05-21 16:36:48 -07:00
tmashuang	13ebb0b455	Moved loose some loose test files to sub folders	2018-05-21 05:59:26 -07:00