unify anvil evm call

Author: mask-pp

driver/chain_syncer/chain_syncer_test.go

@@ -136,14 +136,12 @@ func TestChainSyncerTestSuite(t *testing.T) {
 
 func (s *ChainSyncerTestSuite) TakeSnapshot() {
 	// record snapshot state to revert to before changes
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &s.snapshotID, "evm_snapshot"))
+	s.snapshotID = s.EvmSnapshot()
 }
 
 func (s *ChainSyncerTestSuite) RevertSnapshot() {
 	// revert to the snapshot state so protocol configs are unaffected
-	var revertRes bool
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &revertRes, "evm_revert", s.snapshotID))
-	s.True(revertRes)
+	s.EvmRevert(s.snapshotID)
 	s.Nil(rpc.SetHead(context.Background(), s.RPCClient.L2, common.Big0))
 }
 

driver/driver_test.go

@@ -129,9 +129,7 @@ func (s *DriverTestSuite) TestProcessL1Blocks() {
 }
 
 func (s *DriverTestSuite) TestCheckL1ReorgToHigherFork() {
-	var testnetL1SnapshotID string
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &testnetL1SnapshotID, "evm_snapshot"))
-	s.NotEmpty(testnetL1SnapshotID)
+	var testnetL1SnapshotID = s.EvmSnapshot()
 
 	l1Head1, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil)
 	s.Nil(err)
@@ -159,9 +157,7 @@ func (s *DriverTestSuite) TestCheckL1ReorgToHigherFork() {
 	s.False(reorged)
 
 	// Reorg back to l2Head1
-	var revertRes bool
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &revertRes, "evm_revert", testnetL1SnapshotID))
-	s.True(revertRes)
+	s.EvmRevert(testnetL1SnapshotID)
 
 	l1Head3, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil)
 	s.Nil(err)
@@ -192,9 +188,7 @@ func (s *DriverTestSuite) TestCheckL1ReorgToHigherFork() {
 }
 
 func (s *DriverTestSuite) TestCheckL1ReorgToLowerFork() {
-	var testnetL1SnapshotID string
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &testnetL1SnapshotID, "evm_snapshot"))
-	s.NotEmpty(testnetL1SnapshotID)
+	var testnetL1SnapshotID = s.EvmSnapshot()
 
 	l1Head1, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil)
 	s.Nil(err)
@@ -222,9 +216,7 @@ func (s *DriverTestSuite) TestCheckL1ReorgToLowerFork() {
 	s.False(reorged)
 
 	// Reorg back to l2Head1
-	var revertRes bool
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &revertRes, "evm_revert", testnetL1SnapshotID))
-	s.True(revertRes)
+	s.EvmRevert(testnetL1SnapshotID)
 
 	l1Head3, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil)
 	s.Nil(err)
@@ -252,9 +244,7 @@ func (s *DriverTestSuite) TestCheckL1ReorgToLowerFork() {
 }
 
 func (s *DriverTestSuite) TestCheckL1ReorgToSameHeightFork() {
-	var testnetL1SnapshotID string
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &testnetL1SnapshotID, "evm_snapshot"))
-	s.NotEmpty(testnetL1SnapshotID)
+	var testnetL1SnapshotID = s.EvmSnapshot()
 
 	l1Head1, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil)
 	s.Nil(err)
@@ -282,9 +272,7 @@ func (s *DriverTestSuite) TestCheckL1ReorgToSameHeightFork() {
 	s.False(reorged)
 
 	// Reorg back to l2Head1
-	var revertRes bool
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &revertRes, "evm_revert", testnetL1SnapshotID))
-	s.True(revertRes)
+	s.EvmRevert(testnetL1SnapshotID)
 
 	l1Head3, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil)
 	s.Nil(err)

internal/testutils/suite.go

@@ -92,8 +92,7 @@ func (s *ClientTestSuite) SetupTest() {
 		s.setAllowance(l1ProverPrivKey)
 		s.setAllowance(ownerPrivKey)
 	}
-	s.Nil(rpcCli.L1.CallContext(context.Background(), &s.testnetL1SnapshotID, "evm_snapshot"))
-	s.NotEmpty(s.testnetL1SnapshotID)
+	s.testnetL1SnapshotID = s.EvmSnapshot()
 }
 
 func (s *ClientTestSuite) setAllowance(key *ecdsa.PrivateKey) {
@@ -124,9 +123,7 @@ func (s *ClientTestSuite) setAllowance(key *ecdsa.PrivateKey) {
 }
 
 func (s *ClientTestSuite) TearDownTest() {
-	var revertRes bool
-	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &revertRes, "evm_revert", s.testnetL1SnapshotID))
-	s.True(revertRes)
+	s.EvmRevert(s.testnetL1SnapshotID)
 
 	s.Nil(rpc.SetHead(context.Background(), s.RPCClient.L2, common.Big0))
 	s.Nil(s.proverServer.Shutdown(context.Background()))
@@ -141,3 +138,16 @@ func (s *ClientTestSuite) IncreaseTime(time uint64) {
 	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &result, "evm_increaseTime", time))
 	s.NotNil(result)
 }
+
+func (s *ClientTestSuite) EvmSnapshot() string {
+	var snapshotID string
+	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &snapshotID, "evm_snapshot"))
+	s.NotEmpty(snapshotID)
+	return snapshotID
+}
+
+func (s *ClientTestSuite) EvmRevert(snapshotID string) {
+	var revertRes bool
+	s.Nil(s.RPCClient.L1.CallContext(context.Background(), &revertRes, "evm_revert", snapshotID))
+	s.True(revertRes)
+}