*: Minor improvements to 3box and arweave support

Author: leoyvens

chain/arweave/src/adapter.rs

@@ -18,7 +18,7 @@ impl ArweaveAdapter {
         }
 
         ArweaveAdapter {
-            endpoint: Url::parse(&endpoint).unwrap(),
+            endpoint: Url::parse(&endpoint).expect("Invalid Arweave URL"),
             http_client: reqwest::Client::new(),
         }
     }

core/src/three_box.rs

@@ -16,7 +16,7 @@ impl ThreeBoxAdapter {
         }
 
         ThreeBoxAdapter {
-            profile_endpoint: Url::parse(&profile_endpoint).unwrap(),
+            profile_endpoint: Url::parse(&profile_endpoint).expect("Invalid 3box profile URL"),
             http_client: reqwest::Client::new(),
         }
     }

node/src/main.rs

@@ -238,9 +238,9 @@ async fn main() {
                 ),
         )
         .arg(
-            Arg::with_name("arweave-http")
+            Arg::with_name("arweave-api")
                 .default_value("https://arweave.net/")
-                .long("arweave-http")
+                .long("arweave-api")
                 .value_name("URL")
                 .help("HTTP endpoint of an Arweave gateway"),
         )
@@ -338,7 +338,7 @@ async fn main() {
     }
 
     let arweave_adapter = Arc::new(ArweaveAdapter::new(
-        matches.value_of("arweave-http").unwrap().to_string(),
+        matches.value_of("arweave-api").unwrap().to_string(),
     ));
 
     let three_box_adapter = Arc::new(ThreeBoxAdapter::new(

runtime/wasm/src/module/mod.rs

@@ -982,7 +982,7 @@ impl WasmiModule {
         Ok(None)
     }
 
-    /// function transactionData(txId: string): Bytes | null
+    /// function arweave.transactionData(txId: string): Bytes | null
     fn arweave_transaction_data(
         &mut self,
         tx_id: AscPtr<AscString>,
@@ -994,7 +994,7 @@ impl WasmiModule {
             .or(Some(RuntimeValue::from(0))))
     }
 
-    /// function profile(address: string): JSONValue | null
+    /// function box.profile(address: string): JSONValue | null
     fn box_profile(&mut self, address: AscPtr<AscString>) -> Result<Option<RuntimeValue>, Trap> {
         let address: String = self.asc_get(address);
         let profile = self.ctx.host_exports.box_profile(&address);

tests/integration-tests/arweave-and-3box/package.json

@@ -1,12 +1,12 @@
 {
-  "name": "data-source-context",
+  "name": "arweave-and-3box",
   "version": "0.1.0",
   "scripts": {
     "build-contracts": "rm -rf abis bin && solcjs contracts/Contract.sol --abi -o abis && mv abis/*Contract.abi abis/Contract.abi && solcjs contracts/Contract.sol --bin -o bin && mv bin/*Contract.bin bin/Contract.bin",
     "codegen": "graph codegen",
     "test": "yarn build-contracts && truffle test --network test",
-    "create:test": "graph create test/data-source-context --node http://localhost:18020/",
-    "deploy:test": "graph deploy test/data-source-context --ipfs http://localhost:15001/ --node http://localhost:18020/"
+    "create:test": "graph create test/arweave-and-3box --node http://localhost:18020/",
+    "deploy:test": "graph deploy test/arweave-and-3box --ipfs http://localhost:15001/ --node http://localhost:18020/"
   },
   "devDependencies": {
     "@graphprotocol/graph-cli": "https://github.com/graphprotocol/graph-cli#master",

tests/integration-tests/arweave-and-3box/test/test.js

@@ -10,10 +10,6 @@ const srcDir = path.join(__dirname, "..");
 const fetchSubgraphs = createApolloFetch({
   uri: "http://localhost:18030/graphql"
 });
-const fetchSubgraph = createApolloFetch({
-  uri:
-    "http://localhost:18000/subgraphs/name/test/overloaded-contract-functions"
-});
 
 const exec = cmd => {
   try {

tests/integration-tests/overloaded-contract-functions/contracts/Contract.sol

@@ -6,16 +6,4 @@ contract Contract {
   constructor() public {
     emit Trigger();
   }
-
-  function exampleFunction(string memory) public pure returns (string memory) {
-    return "string -> string";
-  }
-
-  function exampleFunction(uint256) public pure returns (string memory) {
-    return "uint256 -> string";
-  }
-
-  function exampleFunction(bytes32) public pure returns (uint256) {
-    return 256;
-  }
 }