Remove deprecated methods from interface

tablelandnetwork · Mar 29, 2023 · 0473a22 · 0473a22
1 parent f9d80b2
commit 0473a22
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 28 deletions.
diff --git a/contracts/TablelandTables.sol b/contracts/TablelandTables.sol
@@ -51,13 +51,13 @@ contract TablelandTables is
     }
 
     /**
-     * @custom:deprecated See {ITablelandTables-createTable}.
+     * @custom:deprecated
      * This function is deprecated, please use `create`.
      */
     function createTable(
         address owner,
         string calldata statement
-    ) external payable override whenNotPaused returns (uint256) {
+    ) external payable whenNotPaused returns (uint256) {
         return _create(owner, statement);
     }
 
@@ -96,7 +96,7 @@ contract TablelandTables is
         address caller,
         uint256 tableId,
         string calldata statement
-    ) external payable override whenNotPaused nonReentrant {
+    ) external payable whenNotPaused nonReentrant {
         _mutate(caller, tableId, statement);
     }
 

diff --git a/contracts/interfaces/ITablelandTables.sol b/contracts/interfaces/ITablelandTables.sol
@@ -108,14 +108,6 @@ interface ITablelandTables {
         string[] calldata statements
     ) external payable returns (uint256[] memory);
 
-    /**
-     * @custom:deprecated This is a temporary alias for `create`, do not use this.
-     */
-    function createTable(
-        address owner,
-        string calldata statement
-    ) external payable returns (uint256);
-
     /**
      * @dev Runs a mutating SQL statement for `caller` using `statement`.
      *
@@ -159,15 +151,6 @@ interface ITablelandTables {
         ITablelandTables.Statement[] calldata statements
     ) external payable;
 
-    /**
-     * @custom:deprecated This is a temporary alias for `mutate`, do not use this.
-     */
-    function runSQL(
-        address caller,
-        uint256 tableId,
-        string calldata statement
-    ) external payable;
-
     /**
      * @dev Sets the controller for a table. Controller can be an EOA or contract address.
      *

diff --git a/contracts/test/TestCreateFromContract.sol b/contracts/test/TestCreateFromContract.sol
@@ -18,7 +18,7 @@ contract TestCreateFromContract is ERC721, Ownable {
         require(tables[name] == 0, "name already exists");
 
         // Make sure we can get table_id from the created table
-        uint256 tableId = _tableland.createTable(
+        uint256 tableId = _tableland.create(
             msg.sender,
             string(
                 abi.encodePacked(

diff --git a/contracts/test/TestReentrancyRunSQLLegacy.sol b/contracts/test/TestReentrancyRunSQLLegacy.sol
@@ -3,18 +3,18 @@ pragma solidity ^0.8.4;
 
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
-import {ITablelandTables} from "../interfaces/ITablelandTables.sol";
+import {TablelandTables} from "../TablelandTables.sol";
 import {TablelandController} from "../TablelandController.sol";
 import {Policies} from "../policies/Policies.sol";
 import {TablelandPolicy} from "../TablelandPolicy.sol";
 import "../policies/ERC721EnumerablePolicies.sol";
 import "../policies/ERC721AQueryablePolicies.sol";
 
 contract TestReentrancyRunSQLLegacy is TablelandController, ERC721, Ownable {
-    ITablelandTables private _tableland;
+    TablelandTables private _tableland;
 
     constructor(address registry) ERC721("TestCreateFromContract", "MTK") {
-        _tableland = ITablelandTables(registry);
+        _tableland = TablelandTables(registry);
     }
 
     function getPolicy(

diff --git a/contracts/test/TestTablelandTablesNoConstructor.sol b/contracts/test/TestTablelandTablesNoConstructor.sol
@@ -44,7 +44,7 @@ contract TestTablelandTablesNoConstructor is
     function createTable(
         address owner,
         string calldata statement
-    ) external payable override whenNotPaused returns (uint256) {
+    ) external payable whenNotPaused returns (uint256) {
         return _create(owner, statement);
     }
 
@@ -75,7 +75,7 @@ contract TestTablelandTablesNoConstructor is
         address caller,
         uint256 tableId,
         string calldata statement
-    ) external payable override whenNotPaused nonReentrant {
+    ) external payable whenNotPaused nonReentrant {
         _mutate(caller, tableId, statement);
     }
 

diff --git a/contracts/test/TestTablelandTablesUpgrade.sol b/contracts/test/TestTablelandTablesUpgrade.sol
@@ -48,7 +48,7 @@ contract TestTablelandTablesUpgrade is
     function createTable(
         address owner,
         string calldata statement
-    ) external payable override whenNotPaused returns (uint256) {
+    ) external payable whenNotPaused returns (uint256) {
         return _create(owner, statement);
     }
 
@@ -82,7 +82,7 @@ contract TestTablelandTablesUpgrade is
         address caller,
         uint256 tableId,
         string calldata statement
-    ) external payable override whenNotPaused nonReentrant {
+    ) external payable whenNotPaused nonReentrant {
         _mutate(caller, tableId, statement);
     }